Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -78,11 +78,11 @@
       (exit 1)))
 
 (define *db* (open-db))
 
 ;; HACK ALERT: this is a hack, please fix.
-(define *read-only* (file-read-access? (conc *toppath* "/megatest.db")))
+(define *read-only* (not (file-read-access? (conc *toppath* "/megatest.db"))))
 ;; (server:client-setup *db*)
 
 (define toplevel #f)
 (define dlg      #f)
 (define max-test-num 0)

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -38,11 +38,11 @@
 
 (define (open-db) ;;  (conc *toppath* "/megatest.db") (car *configinfo*)))
   (let* ((dbpath    (conc *toppath* "/megatest.db")) ;; fname)
 	 (dbexists  (file-exists? dbpath))
 	 (db        (sqlite3:open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 36000)))
+	 (handler   (make-busy-timeout 3600))) ;; 136000)))
     (sqlite3:set-busy-handler! db handler)
     (if (not dbexists)
 	(db:initialize db))
     db))
 
@@ -806,24 +806,24 @@
      "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt)
     (reverse res)))
 
 (define (db:load-test-data db run-id test-name itemdat)
   (let* ((item-path (item-list->path itemdat))
-	 (testdat (db:get-test-info db run-id test-name item-path))
+	 (testdat (rdb:get-test-info db run-id test-name item-path))
 	 (test-id (if testdat (db:test-get-id testdat) #f)))
     ;; (debug:print 1 "Enter records to insert in the test_data table, seven fields, comma separated per line")
     (debug:print 4 "itemdat: " itemdat ", test-name: " test-name ", test-id: " test-id)
     (if test-id
 	(let loop ((lin (read-line)))
 	  (if (not (eof-object? lin))
 	      (begin
 		(debug:print 4 lin)
-		(db:csv->test-data db test-id lin)
+		(rdb:csv->test-data db test-id lin)
 		(loop (read-line))))))
     ;; roll up the current results.
     ;; FIXME: Add the status to 
-    (db:test-data-rollup db test-id #f)))
+    (rdb:test-data-rollup db test-id #f)))
 
 ;; WARNING: Do NOT call this for the parent test on an iterated test
 ;; Roll up test_data pass/fail results
 ;; look at the test_data status field, 
 ;;    if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS.
@@ -1189,12 +1189,11 @@
 
 (define (rdb:test-set-log! db run-id test-name item-path logf)
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))
 	    (port (vector-ref *runremote* 1)))
-	((rpc:procedure 'rdb:test-set-log! host port)
-	 run-id test-name item-path logf))
+	((rpc:procedure 'rdb:test-set-log! host port) run-id test-name item-path logf))
       (db:test-set-log! db run-id test-name item-path logf)))
 
 (define (rdb:get-runs db runnamepatt numruns startrunoffset keypatts)
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))
@@ -1311,5 +1310,12 @@
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))
 	    (port (vector-ref *runremote* 1)))
 	((rpc:procedure 'rdb:delete-test-records host port) test-id))
       (db:delete-test-records db test-id)))
+
+(define (rdb:test-data-rollup db test-id status)
+    (if *runremote*
+      (let ((host (vector-ref *runremote* 0))
+	    (port (vector-ref *runremote* 1)))
+	((rpc:procedure 'rdb:test-data-rollup host port) test-id status))
+      (db:test-data-rollup db test-id status)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -298,11 +298,11 @@
 	    (mutex-lock! m)
 	    (set! db (open-db))
 	    (if (not (args:get-arg "-server"))
 		(server:client-setup db))
 	    (let* ((item-path (item-list->path itemdat))
-		   (testinfo  (db:get-test-info db run-id test-name item-path)))
+		   (testinfo  (rdb:get-test-info db run-id test-name item-path)))
 	      (if (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		  (begin
 		    (debug:print 2 "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
 		    (test-set-status! db run-id test-name
 				      (if kill-job? "KILLED" "COMPLETED")

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -8,11 +8,11 @@
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 format readline apropos) ;; (srfi 18) extras)
 (import (prefix sqlite3 sqlite3:))
 (import (prefix base64 base64:))
 
 (declare (uses common))
 (declare (uses megatest-version))
@@ -337,12 +337,14 @@
 (if (and (args:get-arg "-server")
 	 (not (or (args:get-arg "-runall")
 		  (args:get-arg "-runtests"))))
     (let* ((toppath (setup-for-run))
 	   (db      (if toppath (open-db) #f)))
+      (debug:print 0 "INFO: Starting the standalone server")
       (if db 
-	  (server:start db (args:get-arg "-server"))
+	  (let ((th2 (server:start db (args:get-arg "-server"))))
+	    (thread-join! th2))
 	  (debug:print 0 "ERROR: Failed to setup for megatest"))))
 
 ;;======================================================================
 ;; full run
 ;;======================================================================
@@ -455,11 +457,11 @@
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
 		 (keys     (rdb:get-keys db))
 		 (keynames (map key:get-fieldname keys))
-		 (paths    (db:test-get-paths-matching db keynames target)))
+		 (paths    (rdb:test-get-paths-matching db keynames target)))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
@@ -466,11 +468,11 @@
 	(general-run-call 
 	 "-test-paths"
 	 "Get paths to tests"
 	 (lambda (db target runname keys keynames keyvallst)
 	   (let* ((itempatt (args:get-arg "-itempatt"))
-		  (paths    (db:test-get-paths-matching db keynames target)))
+		  (paths    (rdb:test-get-paths-matching db keynames target)))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
 ;;======================================================================
@@ -614,17 +616,18 @@
 		(exit 1)))
 	  (set! db (open-db))
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (if (args:get-arg "-load-test-data")
+	      ;; has sub commands that are rdb:
 	      (db:load-test-data db run-id test-name itemdat))
 	  (if (args:get-arg "-setlog")
-	      (test-set-log! db run-id test-name itemdat (args:get-arg "-setlog")))
+	      (rdb:test-set-log! db run-id test-name itemdat (args:get-arg "-setlog")))
 	  (if (args:get-arg "-set-toplog")
-	      (test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
+	      (rdb:test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
-	      (tests:summarize-items db run-id test-name #t)) ;; do force here
+	      (rdb:tests:summarize-items db run-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)
 		  (begin
 		    (debug:print 0 "ERROR: nothing specified to run!")
 		    (sqlite3:finalize! db)
@@ -664,11 +667,11 @@
 			  (debug:print 2 "INFO: running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
-			  (test-set-log! db run-id test-name itemdat htmllogfile)))
+			  (rdb:test-set-log! db run-id test-name itemdat htmllogfile)))
 		    (rdb:teststep-set-status! db run-id test-name stepname "end" exitstat itemdat (args:get-arg "-m") logfile)
 		    (sqlite3:finalize! db)
 		    (if (not (eq? exitstat 0))
 			(exit 254)) ;; (exit exitstat) doesn't work?!?
 		  ;; open the db
@@ -694,11 +697,11 @@
 			     (not status)))
 		    (begin
 		      (debug:print 0 "ERROR: You must specify :state and :status with every call to -test-status\n" help)
 		      (sqlite3:finalize! db)
 		      (exit 6)))
-		(test-set-status! db run-id test-name state newstatus itemdat (args:get-arg "-m") otherdata)))
+		(rtests:test-set-status! db run-id test-name state newstatus itemdat (args:get-arg "-m") otherdata)))
 	  (sqlite3:finalize! db)
 	  (set! *didsomething* #t))))
 
 (if (args:get-arg "-showkeys")
     (let ((db #f)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -8,11 +8,11 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking)
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit runs))
 (declare (uses db))
 (declare (uses common))
@@ -571,11 +571,12 @@
 ;; this wrapper is used to reduce the replication of code
 (define (general-run-call switchname action-desc proc)
   (let ((runname (args:get-arg ":runname"))
 	(target  (if (args:get-arg "-target")
 		     (args:get-arg "-target")
-		     (args:get-arg "-reqtarg"))))
+		     (args:get-arg "-reqtarg")))
+	(th1     #f))
     (cond
      ((not target)
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the target with -target")
       (exit 3))
      ((not runname)
@@ -587,12 +588,15 @@
 	(if (not (setup-for-run))
 	    (begin 
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	(set! db   (open-db))
-	(if (not (args:get-arg "-server"))
-	    (server:client-setup db))
+	(if (args:get-arg "-server")
+	    (server:start db (args:get-arg "-server"))
+	    (if (not (or (args:get-arg "-runall")
+			  (args:get-arg "-runtests")))
+		(set! th1 (server:client-setup db))))
 	(set! keys (rdb:get-keys db))
 	;; have enough to process -target or -reqtarg here
 	(if (args:get-arg "-reqtarg")
 	    (let* ((runconfigf (conc  *toppath* "/runconfigs.config")) ;; DO NOT EVALUATE ALL 
 		   (runconfig  (read-config runconfigf #f #f environ-patt: #f))) 
@@ -611,10 +615,11 @@
 	    ;; Extract out stuff needed in most or many calls
 	    ;; here then call proc
 	    (let* ((keynames   (map key:get-fieldname keys))
 		   (keyvallst  (keys->vallist keys #t)))
 	      (proc db target runname keys keynames keyvallst)))
+	(if th1 (thread-join! th1))
 	(sqlite3:finalize! db)
 	(set! *didsomething* #t))))))
 
 ;;======================================================================
 ;; Rollup runs

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -198,17 +198,34 @@
     (rpc:publish-procedure!
      'rtests:register-test
      (lambda (run-id test-name item-path)
        (tests:register-test db run-id test-name item-path)))
 
+    (rpc:publish-procedure!
+     'rdb:test-data-rollup
+     (lambda (test-id status)
+       (db:test-data-rollup db test-id status)))
+    
+    (rpc:publish-procedure!
+     'rtests:test-set-status!
+     (lambda (run-id test-name state status itemdat-or-path comment dat)
+       (test-set-status! db run-id test-name state status itemdat-or-path comment dat)))
+
+    ;;======================================================================
+    ;; end of publish-procedure section
+    ;;======================================================================
+
     (set! *rpc:listener* rpc:listener)
     (on-exit (lambda ()
 	       (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' and val=?;" host:port)
 	       (sqlite3:finalize! db)))
     (thread-start! th1)
     (thread-start! th2)
-    (thread-join!  th2))) ;; rpc:server)))
+    ;; (thread-join!  th2)
+    ;; return th2 for the calling process to do a join with 
+    th2
+    )) ;; rpc:server)))
 
 (define (server:find-free-port-and-open port)
   (handle-exceptions
    exn
    (begin

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -387,5 +387,12 @@
   (if *runremote*
       (let ((host (vector-ref *runremote* 0))
 	    (port (vector-ref *runremote* 1)))
 	((rpc:procedure 'rtests:register-test host port) run-id test-name item-path))
       (tests:register-test db run-id test-name item-path)))
+
+(define (rtests:test-set-status!  db run-id test-name state status itemdat-or-path comment dat)
+  (if *runremote*
+      (let ((host (vector-ref *runremote* 0))
+	    (port (vector-ref *runremote* 1)))
+	((rpc:procedure 'rtests:test-set-status! host port) run-id test-name state status itemdat-or-path comment dat))
+      (test-set-status! db run-id test-name state status itemdat-or-path comment dat)))