Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -4,13 +4,13 @@
 INSTALL=install
 SRCFILES = common.scm items.scm launch.scm \
            ods.scm runconfig.scm server.scm configf.scm \
            db.scm keys.scm margs.scm megatest-version.scm \
            process.scm runs.scm tasks.scm tests.scm genexample.scm \
-	   fs-transport.scm http-transport.scm \
+	   fs-transport.scm http-transport.scm filedb.scm \
            client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
-	   tree.scm ezsteps.scm lock-queue.scm sdb.scm filedb.scm \
+	   tree.scm ezsteps.scm lock-queue.scm sdb.scm \
 	   rmt.scm api.scm tdb.scm
 
 GUISRCF  = dashboard-tests.scm dashboard-guimonitor.scm 
 
 OFILES   = $(SRCFILES:%.scm=%.o)

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -93,10 +93,15 @@
   (set! *test-ids*           (make-hash-table))
   (set! *test-info*          (make-hash-table))
   (set! *run-info-cache*     (make-hash-table))
   (set! *env-vars-by-run-id* (make-hash-table))
   (set! *test-id-cache*      (make-hash-table)))
+
+;; Generic string database (normalization of sorts)
+(define sdb:qry #f) ;; (make-sdb:qry)) ;;  'init #f)
+;; Generic path database (normalization of sorts)
+(define *fdb* #f)
 
 ;;======================================================================
 ;; S T A T E S   A N D   S T A T U S E S
 ;;======================================================================
 

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -26,10 +26,12 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses gutils))
 (declare (uses rmt))
 (declare (uses ezsteps))
+(declare (uses sdb))
+(declare (uses filedb))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
@@ -74,11 +76,11 @@
 	      lbl)
 	    (store-label "testcomment"
 			 (iup:label "TestComment                             "
 				    #:expand "HORIZONTAL")
 			 (lambda (testdat)
-			   (db:test-get-comment testdat)))
+			   (sdb:qry 'getstr (db:test-get-comment testdat))))
 	    (store-label "testid"
 			 (iup:label "TestId                             "
 				    #:expand "HORIZONTAL")
 			 (lambda (testdat)
 			   (db:test-get-id testdat)))
@@ -181,15 +183,15 @@
 		   (iup:label "" #:expand "VERTICAL")))
     (apply iup:vbox ; #:expand "YES"
 	   (list
 	    ;; NOTE: Yes, the host can change!
 	    (store-label "HostName"
-			 (iup:label (db:test-get-host testdat) #:expand "HORIZONTAL")
+			 (iup:label (sdb:qry 'getstr (db:test-get-host testdat)) #:expand "HORIZONTAL")
 			 (lambda (testdat)(db:test-get-host testdat)))
 	    (store-label "Uname"
 			 (iup:label "                                                   " #:expand "HORIZONTAL")
-			 (lambda (testdat)(db:test-get-uname testdat)))
+			 (lambda (testdat)(sdb:qry 'getstr (db:test-get-uname testdat))))
 	    (store-label "DiskFree"
 			 (iup:label (conc (db:test-get-diskfree testdat)) #:expand "HORIZONTAL")
 			 (lambda (testdat)(conc (db:test-get-diskfree testdat))))
 	    (store-label "CPULoad"
 			 (iup:label (conc (db:test-get-cpuload testdat)) #:expand "HORIZONTAL")
@@ -524,11 +526,11 @@
 			       (cond
 				((and need-update newtestdat)
 				 (set! testdat newtestdat)
 				 (set! teststeps    (dashboard-tests:get-compressed-steps db test-id))
 				 (set! logfile      (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat)))
-				 (set! rundir       (db:test-get-rundir testdat))
+				 (set! rundir       (filedb:get-path *fdb* (db:test-get-rundir testdat)))
 				 (set! testfullname (db:test-get-fullname testdat))
 				 ;; (debug:print 0 "INFO: teststeps=" (intersperse teststeps "\n    "))
 				 
 				 ;; I don't see why this was implemented this way. Please comment it ...
 				 ;; (if (eq? curr-mod-time db-mod-time) ;; do only once if same

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -87,10 +87,12 @@
     (begin
       (print "Failed to find megatest.config, exiting") 
       (exit 1)))
 
 (define *db* (open-db))
+
+;; (define sdb:qry (make-sdb:qry)) ;;  'init #f)
 
 ;; (if (args:get-arg "-host")
 ;;     (begin
 ;;       (set! *runremote* (string-split (args:get-arg "-host" ":")))
 ;;       (client:launch))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -28,10 +28,11 @@
 (declare (uses keys))
 (declare (uses ods))
 (declare (uses fs-transport))
 (declare (uses client))
 (declare (uses mt))
+(declare (uses sdb))
 (declare (uses filedb))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
@@ -72,10 +73,11 @@
 		     #f))))
     (if val
 	(begin
 	  (debug:print-info 9 "db:set-sync, setting pragma synchronous to " val)
 	  (sqlite3:execute db (conc "PRAGMA synchronous = '" val "';"))))))
+;;	(sqlite3:execute db "PRAGMA synchronous = normal;")))) ;; need a default?
 
 ;;======================================================================
 ;; K E E P   F I L E D B   I N   dbstruct
 ;;======================================================================
 
@@ -172,10 +174,12 @@
 	 (handler   (make-busy-timeout 3600)))
     (if (or (not path)
 	    (not exists))
 	(db:initialize db))
     (sqlite3:set-busy-handler! db handler)
+    (set! sdb:qry (make-sdb:qry)) ;; we open the normalization helpers here
+    (set! *fdb*   (filedb:open-db (conc *toppath* "/db/paths.db")))
     db))
 
 ;; (define (db:sync-table tblname fields fromdb todb)
 
 (define (db:tbls db)
@@ -1051,11 +1055,11 @@
     (let ((finalres (vector header res)))
       ;; (hash-table-set! *run-info-cache* run-id finalres)
       finalres)))
 
 (define (db:set-comment-for-run dbstruct run-id comment)
-  (sqlite3:execute (db:get-db dbstruct #f) "UPDATE runs SET comment=? WHERE id=?;" comment run-id))
+  (sqlite3:execute db "UPDATE runs SET comment=? WHERE id=?;" (sdb:qry 'getid comment) run-id))
 
 ;; does not (obviously!) removed dependent data. But why not!!?
 (define (db:delete-run dbstruct run-id)
   ;; First set any related tests to DELETED
   (let ((db (db:get-db dbstruct run-id)))
@@ -1298,17 +1302,17 @@
 ;;
 (define (db:test-set-state-status-by-id dbstruct run-id test-id newstate newstatus newcomment)
   (let ((db (db:get-db dbstruct run-id)))
     (cond
      ((and newstate newstatus newcomment)
-      (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus newcomment test-id))
+    (sqlite3:execute db "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;" newstate newstatus (sdb:qry 'getid newcomment) test-id))
      ((and newstate newstatus)
       (sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
      (else
       (if newstate   (sqlite3:execute db "UPDATE tests SET state=?   WHERE id=?;" newstate   test-id))
       (if newstatus  (sqlite3:execute db "UPDATE tests SET status=?  WHERE id=?;" newstatus  test-id))
-      (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id))))
+    (if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" (sdb:qry 'getid newcomment) test-id))))
     (mt:process-triggers test-id newstate newstatus)))
 
 ;; Never used, but should be?
 (define (db:test-set-state-status-by-run-id-testname db run-id test-name item-path status state)
   (sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;" 
@@ -1441,11 +1445,13 @@
 
 (define (db:teststep-set-status! db test-id teststep-name state-in status-in comment logfile)
    (sqlite3:execute 
     db
     "INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment,logfile) VALUES(?,?,?,?,?,?,?);"
-    test-id teststep-name state-in status-in (current-seconds) (if comment comment "") (if logfile logfile "")))
+    test-id teststep-name state-in status-in (current-seconds)
+    (sdb:qry 'getid  (if comment comment ""))
+    (sdb:qry 'getid  (if logfile logfile ""))))
    
 ;; db-get-test-steps-for-run
 (define (db:get-steps-for-test db test-id)
   (let* ((res '()))
     (sqlite3:for-each-row 
@@ -1678,16 +1684,16 @@
 
 (define (db:test-get-logfile-info dbstruct run-id test-name)
   (let ((res #f))
     (sqlite3:for-each-row 
      (lambda (path-id final_logf-id)
-       (let ((path       (db:get-path   dbstruct path-id))
-	     (final_logf (db:get-string dbstruct final_logf-id)))
-       (set! logf final_logf)
-       (set! res (list path final_logf))
-       (if (directory? path)
-	   (debug:print 2 "Found path: " path)
+       (let ((path       (sdb:qry 'getstr path-id))
+	     (final_logf (sdb:qry 'getstr final_logf-id)))
+	 (set! logf final_logf)
+	 (set! res (list path final_logf))
+	 (if (directory? path)
+	     (debug:print 2 "Found path: " path)
 	     (debug:print 2 "No such path: " path))))
      (db:get-db dbstruct run-id)
      "SELECT rundir_id,final_logf_id FROM tests WHERE testname=? AND item_path='';"
      test-name)
     res))

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -16,18 +16,20 @@
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+(declare (uses sdb))
+(declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 
 (define (ezsteps:run-from testdat start-step-name run-one)
-  (let* ((test-run-dir  (db:test-get-rundir testdat))
+  (let* ((test-run-dir  (filedb:get-path *fdb* (db:test-get-rundir testdat)))
 	 (testconfig    (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars"))
 	 (ezstepslst    (hash-table-ref/default testconfig "ezsteps" '()))
 	 (run-mutex     (make-mutex))
 	 (rollup-status 0)
 	 (exit-info     (vector #t #t #t))

Index: filedb.scm
==================================================================
--- filedb.scm
+++ filedb.scm
@@ -23,11 +23,11 @@
     (filedb:fdb-set-db!        fdb db)
     (filedb:fdb-set-dbpath!    fdb dbpath)
     (filedb:fdb-set-pathcache! fdb (make-hash-table))
     (filedb:fdb-set-idcache!   fdb (make-hash-table))
     (filedb:fdb-set-partcache! fdb (make-hash-table))
-    ;(sqlite3:set-busy-timeout! db 1000000)
+    (sqlite3:set-busy-handler!  db (make-busy-timeout 136000))
     (if (not dbexists)
 	(begin
 	  (sqlite3:execute db "PRAGMA synchronous = OFF;")
 	  (sqlite3:execute db "CREATE TABLE names (id INTEGER PRIMARY KEY,name TEST);") ;; for future use - change path in paths table to path_id
 	  (sqlite3:execute db "CREATE INDEX name_index ON names (name);")
@@ -40,12 +40,20 @@
                                                    gid       INTEGER DEFAULT -1,
                                                    size      INTEGER DEFAULT -1,
                                                    mtime     INTEGER DEFAULT -1);")
 	  (sqlite3:execute db "CREATE INDEX path_index ON paths (path,parent_id);")
 	  (sqlite3:execute db "CREATE TABLE bases (id INTEGER PRIMARY KEY,base TEXT,                  updated TIMESTAMP);")))
+    ;; close the sqlite3 db and open it as needed
+    (filedb:finalize-db! fdb)
+    (filedb:fdb-set-db! fdb #f)
     fdb))
 
+(define (filedb:reopen-db fdb)
+  (let ((db (sqlite3:open-database (filedb:fdb-get-dbpath fdb))))
+    (filedb:fdb-set-db! fdb db)
+    (sqlite3:set-busy-handler!  db (make-busy-timeout 136000))))
+  
 (define (filedb:finalize-db! fdb)
   (sqlite3:finalize! (filedb:fdb-get-db fdb)))
 
 (define (filedb:get-current-time-string)
   (string-chomp (time->string (seconds->local-time (current-seconds)))))
@@ -108,10 +116,11 @@
 (define (filedb:register-path fdb path #!key (save-stat #f))
   (let* ((db        (filedb:fdb-get-db        fdb))
 	 (pathcache (filedb:fdb-get-pathcache fdb))
 	 (stat      (if save-stat (file-stat path #t)))
 	 (id        (hash-table-ref/default pathcache path #f)))
+    (if (not db)(filedb:reopen-db fdb))
     (if id id 
         (let ((plist (string-split path "/")))
           (let loop ((head (car plist))
                      (tail (cdr plist))
                      (parent 0))
@@ -214,10 +223,11 @@
 
 (define (filedb:get-path fdb id)
   (let* ((db      (filedb:fdb-get-db      fdb))
 	 (idcache (filedb:fdb-get-idcache fdb))
 	 (path    (hash-table-ref/default idcache id #f)))
+    (if (not db)(filedb:reopen-db fdb))
     (if path path
         (let loop ((curr-id id)
                    (path    ""))
           (let ((path-record (filedb:get-path-record fdb curr-id)))
             (if (not path-record) #f ;; this id has no path

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -19,11 +19,13 @@
 
 (declare (unit launch))
 (declare (uses common))
 (declare (uses configf))
 (declare (uses db))
+(declare (uses sdb))
 (declare (uses tdb))
+(declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 
@@ -497,10 +499,11 @@
 	 (lnkbase  (conc linktree "/" target "/" runname))
 	 (lnkpath  (conc lnkbase "/" testname))
 	 (lnkpathf (conc lnkpath (if not-iterated "" "/") item-path)))
 
     ;; Update the rundir path in the test record for all
+    ;; (cdb:test-set-rundir-by-test-id *runremote* test-id (filedb:register-path *fdb* lnkpathf))
     (rmt:general-call 'test-set-rundir-by-test-id lnkpathf test-id)
 
     (debug:print 2 "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
     (if (not (file-exists? linktree))
 	(begin
@@ -518,13 +521,14 @@
 
     ;; NB - This is not working right - some top tests are not getting the path set!!!
 
     (if (not (hash-table-ref/default *toptest-paths* testname #f))
 	(let* ((testinfo       (rmt:get-test-info-by-id test-id)) ;;  run-id testname item-path))
-	       (curr-test-path (if testinfo (db:test-get-rundir testinfo) #f)))
+	       (curr-test-path (if testinfo (filedb:get-path *fdb* (db:test-get-rundir testinfo)) #f)))
 	  (hash-table-set! *toptest-paths* testname curr-test-path)
 	  ;; NB// Was this for the test or for the parent in an iterated test?
+	  ;;(cdb:test-set-rundir! *runremote* run-id testname "" (filedb:register-path *fdb* lnkpath)) ;; toptest-path)
 	  (rmt:general-call 'test-set-rundir lnkpath run-id testname "") ;; toptest-path)
 	  (if (or (not curr-test-path)
 		  (not (directory-exists? toptest-path)))
 	      (begin
 		(debug:print-info 2 "Creating " toptest-path " and link " lnkpath)

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -25,10 +25,12 @@
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
 (declare (uses daemon))
 (declare (uses db))
+(declare (uses sdb))
+(declare (uses filedb))
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
@@ -238,10 +240,13 @@
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-gen-megatest-area"
 			"-mark-incompletes"
+
+			"-convert-to-norm"
+			"-convert-to-old"
 
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 		       )
@@ -627,12 +632,12 @@
 			   	     (equal? (db:test-get-status test) "WARN")
 				     (equal? (db:test-get-state test)  "NOT_STARTED")))
 			    (begin
 			      (print   "         cpuload:  " (db:test-get-cpuload test)
 				     "\n         diskfree: " (db:test-get-diskfree test)
-				     "\n         uname:    " (db:test-get-uname test)
-				     "\n         rundir:   " (db:test-get-rundir test)
+				     "\n         uname:    " (sdb:qry 'getstr (db:test-get-uname test))
+				     "\n         rundir:   " (filedb:get-path *fdb* (db:test-get-rundir test))
 				     )
 			      ;; Each test
 			      ;; DO NOT remote run
 			      (let ((steps (db:get-steps-for-test db (db:test-get-id test))))
 				(for-each 
@@ -964,10 +969,11 @@
 	      ;; has sub commands that are rdb:
 	      ;; DO NOT put this one into either cdb:remote-run or open-run-close
 	      (tdb:load-test-data test-id))
 	  (if (args:get-arg "-setlog")
 	      (let ((logfname (args:get-arg "-setlog")))
+		;; (cdb:test-set-log! *runremote* test-id (sdb:qry 'getid logfname))))
 		(rmt:test-set-log! test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
 	      ;; DO NOT run remote
 	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-summarize-items")
@@ -1009,10 +1015,11 @@
 			  (debug:print-info 2 "running \"" cmd "\"")
 			  (change-directory startingdir)
 			  (set! exitstat (system cmd))
 			  (set! *globalexitstatus* exitstat) ;; no necessary
 			  (change-directory testpath)
+			  ;; (cdb:test-set-log! *runremote* test-id (sdb:qry 'getid htmllogfile))))
 			  (rmt:test-set-log! test-id htmllogfile)))
 		    (let ((msg (args:get-arg "-m")))
 		      (rmt:teststep-set-status! test-id stepname "end" exitstat msg logfile))
 		    )))
 	  (if (or (args:get-arg "-test-status")
@@ -1159,10 +1166,35 @@
 	    (if (args:get-arg "-repl")
 		(repl)
 		(load (args:get-arg "-load"))))
 	  (exit))
       (set! *didsomething* #t)))
+
+(if (args:get-arg "-convert-to-norm")
+    (let* ((toppath (setup-for-run))
+	   (db      (if toppath (open-db) #f)))
+      (for-each 
+       (lambda (field)
+	 (let ((dat '()))
+	   (debug:print-info 0 "Getting data for field " field)
+	   (sqlite3:for-each-row
+	    (lambda (id val)
+	      (set! dat (cons (list id val) dat)))
+	    db
+	    (conc "SELECT id," field " FROM tests;"))
+	   (debug:print-info 0 "found " (length dat) " items for field " field)
+	   (let ((qry (sqlite3:prepare db (conc "UPDATE tests SET " field "=? WHERE id=?;"))))
+	     (for-each
+	      (lambda (item)
+		(let ((newval (sdb:qry 'getid (cadr item))))
+		  (if (not (equal? newval (cadr item)))
+		      (debug:print-info 0 "Converting " (cadr item) " to " newval " for test #" (car item)))
+		  (sqlite3:execute qry newval (car item))))
+	      dat)
+	     (sqlite3:finalize! qry))))
+       (list "uname" "rundir" "final_logf" "comment"))
+      (set! *didsomething* #t)))
 
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
@@ -1171,10 +1203,13 @@
 ;; this is the socket if we are a client
 ;; (if (and *runremote*
 ;; 	 (socket? *runremote*))
 ;;     (close-socket *runremote*))
 
+(if sdb:qry (sdb:qry 'finalize #f))
+(if *fdb*   (filedb:finalize-db! *fdb*))
+
 (if (not *didsomething*)
     (debug:print 0 help))
 
 ;; (if *runremote* (rpc:close-all-connections!))
     

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -18,10 +18,11 @@
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses runs))
 (declare (uses rmt))
+(declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -126,11 +127,11 @@
 ;;  T R I G G E R S
 ;;======================================================================
 
 (define (mt:process-triggers test-id newstate newstatus)
   (let* ((test-dat      (rmt:get-test-info-by-id test-id))
-	 (test-rundir   (db:test-get-rundir test-dat))
+	 (test-rundir   (filedb:get-path *fdb* (db:test-get-rundir test-dat)))
 	 (test-name     (db:test-get-testname test-dat))
 	 (tconfig       #f)
 	 (state         (if newstate  newstate  (db:test-get-state  test-dat)))
 	 (status        (if newstatus newstatus (db:test-get-status test-dat))))
     (if (and (file-exists? test-rundir)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -19,10 +19,11 @@
 (declare (uses items))
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
+(declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -1257,12 +1258,12 @@
 		    action)
 		   ((run-wait)
 		    (debug:print 1 "Waiting for run " runkey ", run=" runnamepatt " to complete"))
 		   (else
 		    (debug:print-info 0 "action not recognised " action)))
-		 (let ((sorted-tests     (sort tests (lambda (a b)(let ((dira (db:test-get-rundir a))
-									(dirb (db:test-get-rundir b)))
+		 (let ((sorted-tests     (sort tests (lambda (a b)(let ((dira (filedb:get-path *fdb* (db:test-get-rundir a)))
+									(dirb (filedb:get-path *fdb* (db:test-get-rundir b))))
 								    (if (and (string? dira)(string? dirb))
 									(> (string-length dira)(string-length dirb))
 									#f)))))
 		       (test-retry-time  (make-hash-table))
 		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
@@ -1275,11 +1276,11 @@
 			     (debug:print 0 "ERROR: We have a test-id of " test-id " but no record was found. NOTE: No locking of records is done between processes, do not simultaneously remove the same run from two processes!")
 			     (if (not (null? tal))
 				 (loop (car tal)(cdr tal))))
 			   (let* ((item-path     (db:test-get-item-path new-test-dat))
 				  (test-name     (db:test-get-testname new-test-dat))
-				  (run-dir       (db:test-get-rundir new-test-dat))    ;; run dir is from the link tree
+				  (run-dir       (filedb:get-path *fdb* (db:test-get-rundir new-test-dat)))    ;; run dir is from the link tree
 				  (real-dir      (if (file-exists? run-dir)
 						     (resolve-pathname run-dir)
 						     #f))
 				  (test-state    (db:test-get-state new-test-dat))
 				  (test-fulln    (db:test-get-fullname new-test-dat)))

Index: sdb.scm
==================================================================
--- sdb.scm
+++ sdb.scm
@@ -20,27 +20,25 @@
 (import (prefix base64 base64:))
 
 (declare (unit sdb))
 
 ;; 
-(define (sdb:open) ;;  (conc *toppath* "/megatest.db") (car *configinfo*)))
+(define (sdb:open #!key (fname #f)) ;;  (conc *toppath* "/megatest.db") (car *configinfo*)))
   (if (not *toppath*)
       (if (not (setup-for-run))
 	  (begin
 	    (debug:print 0 "ERROR: Attempted to open db when not in megatest area. Exiting.")
 	    (exit))))
-  (let* ((dbpath    (conc *toppath* "/db/sdb.db")) ;; fname)
+  (let* ((dbpath    (conc *toppath* "/db/" (if fname fname "sdb.db"))) ;; fname)
 	 (dbexists  (let ((fe (file-exists? dbpath)))
 		      (if fe 
 			  fe
 			  (begin
 			    (create-directory (conc *toppath* "/db") #t)
 			    #f))))
 	 (sdb        (sqlite3:open-database dbpath))
-	 (handler   (make-busy-timeout (if (args:get-arg "-override-timeout")
-					   (string->number (args:get-arg "-override-timeout"))
-					   136000))))
+	 (handler   (make-busy-timeout 136000)))
     (sqlite3:set-busy-handler! sdb handler)
     (if (not dbexists)
 	(sdb:initialize sdb))
     (sqlite3:execute sdb "PRAGMA synchronous = 1;")
     sdb))
@@ -77,20 +75,27 @@
 	   (hash-table-set! id-cache id str))
 	 sdb
 	 "SELECT str FROM strs WHERE id=?;" id))
     str))
 
-(define sdb:qry
-  (let ((sdb    #f)
+;; Numbers get passed though in both directions
+;;
+(define (make-sdb:qry #!key (fname #f))
+  (let ((sdb    #f) ;; (sdb:open fname: fname))
 	(scache (make-hash-table))
 	(icache (make-hash-table)))
     (lambda (cmd var)
-      (if (not sdb)(set! sdb (sdb:open)))
+      (if (not sdb)(set! sdb (sdb:open fname: fname)))
       (case cmd
-	((init)      (if (not sdb)(set! sdb (sdb:open))))
-	((finalize!) (if sdb (sqlite3:finalize! sdb)))
-	((getid)     (let ((id (sdb:string->id sdb scache var)))
+	((finalize) (if sdb
+			(begin
+			  (sqlite3:finalize! sdb)
+			  (set! sdb #f))))
+	((getid)     (let ((id (if (or (number? var)
+				       (string->number var))
+				   var
+				   (sdb:string->id sdb scache var))))
 		       (if id
 			   id
 			   (begin
 			     (sdb:register-string sdb var)
 			     (sdb:string->id sdb scache var)))))

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -21,10 +21,11 @@
 (declare (uses db))
 (declare (uses tdb))
 (declare (uses common))
 (declare (uses items))
 (declare (uses runconfig))
+(declare (uses sdb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
@@ -133,12 +134,12 @@
 ;; Check for waiver eligibility
 ;;
 (define (tests:check-waiver-eligibility testdat prev-testdat)
   (let* ((test-registry (make-hash-table))
 	 (testconfig  (tests:get-testconfig (db:test-get-testname testdat) test-registry #f))
-	 (test-rundir (db:test-get-rundir testdat))
-	 (prev-rundir (db:test-get-rundir prev-testdat))
+	 (test-rundir (sdb:qry 'getstr (db:test-get-rundir testdat)))
+	 (prev-rundir (sdb:qry 'getstr (db:test-get-rundir prev-testdat)))
 	 (waivers     (configf:section-vars testconfig "waivers"))
 	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
 	 (diff-rule   "diff %file1% %file2%")
 	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
     (if (not (file-exists? test-rundir))

Index: zmq-transport.scm
==================================================================
--- zmq-transport.scm
+++ zmq-transport.scm
@@ -1,14 +1,15 @@
-
+;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
 ;;  This program is made available under the GNU GPL version 2.0 or
 ;;  greater. See the accompanying file COPYING for details.
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
+;;======================================================================
 
 (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:))