@@ -302,11 +302,11 @@
 ;; This routine creates the db if not already present. It is only called if the db is not already opened
 ;;
 (define (db:open-db dbstruct run-id #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath
   (let ((tmpdb-stack (dbr:dbstruct-dbstack dbstruct))) ;; RA => Returns the first reference in dbstruct
     (if (stack? tmpdb-stack)
-	(db:get-db tmpdb-stack) ;; get previously opened db (will create new db handle if all in the stack are already used
+	(db:get-db tmpdb-stack run-id) ;; 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* "/"dbname))
@@ -425,11 +425,11 @@
     (cons db dbpath)))
 
 ;; sync run to disk if touched
 ;;
 (define (db:sync-touched dbstruct run-id #!key (force-sync #f))
-  (let ((tmpdb   (db:get-db dbstruct))
+  (let ((tmpdb   (db:get-db dbstruct run-id))
 	(mtdb    (dbr:dbstruct-mtdb   dbstruct))
         (refndb  (dbr:dbstruct-refndb dbstruct))
 	(start-t (current-seconds)))
     (debug:print-info 4 *default-log-port* "Syncing for run-id: " run-id)
     (mutex-lock! *db-multi-sync-mutex*)
@@ -1058,10 +1058,11 @@
 ;;  run-ids: '(1 2 3 ...) or #f (for all)
 ;;
 (define (db:multi-db-sync dbstruct . options)
   ;; (if (not (launch:setup))
   ;;    (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.")
+  (assert #f "FATAL: Call to db:multi-db-sync which is not completed yet.")
   (let* ((mtdb     (dbr:dbstruct-mtdb dbstruct))
 	 (tmpdb    (db:get-db dbstruct))
 	 (refndb   (dbr:dbstruct-refndb dbstruct))
 	 (allow-cleanup #t) ;; (if run-ids #f #t))
 	 (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat)))
@@ -1137,11 +1138,11 @@
 	 
 	 
 	 ;; more to do here?
 	 
 	 
-	 (tmpdb       (db:get-db dbstruct))
+	 (tmpdb       (db:get-db dbstruct run-id))
 	 (refndb      (dbr:dbstruct-refndb dbstruct))
 	 (res         (db:sync-tables (db:sync-all-tables-list dbstruct) last-update tmpdb refndb mtdb)))
     (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)
     res))
 
@@ -1552,11 +1553,11 @@
 ;; dneeded is minimum space needed, scan for existing archives that 
 ;; are on disks with adequate space and already have this test/itempath
 ;; archived
 ;;
 (define (db:archive-get-allocations dbstruct testname itempath dneeded)
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
+  (let* ((dbdat        (db:get-db dbstruct #f)) ;; archive tables are in main.db
 	 (db           (db:dbdat-get-db dbdat))
 	 (res          '())
 	 (blocks       '())) ;; a block is an archive chunck that can be added too if there is space
     (sqlite3:for-each-row
      (lambda (id archive-disk-id disk-path last-du last-du-time)
@@ -1584,11 +1585,11 @@
     
 ;; returns id of the record, register a disk allocated to archiving and record it's last known
 ;; available space
 ;;
 (define (db:archive-register-disk dbstruct bdisk-name bdisk-path df)
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
+  (let* ((dbdat        (db:get-db dbstruct #f)) ;; archive tables are in main.db
 	 (db           (db:dbdat-get-db dbdat))
 	 (res          #f))
     (sqlite3:for-each-row
      (lambda (id)
        (set! res id))
@@ -1614,11 +1615,11 @@
 ;; record an archive path created on a given archive disk (identified by it's bdisk-id)
 ;; if path starts with / then it is full, otherwise it is relative to the archive disk
 ;; preference is to store the relative path.
 ;;
 (define (db:archive-register-block-name dbstruct bdisk-id archive-path #!key (du #f))
-  (let* ((dbdat        (db:get-db dbstruct)) ;; archive tables are in main.db
+  (let* ((dbdat        (db:get-db dbstruct #f)) ;; archive tables are in main.db
 	 (db           (db:dbdat-get-db dbdat))
 	 (res          #f))
     ;; first look to see if this path is already registered
     (sqlite3:for-each-row
      (lambda (id)
@@ -4880,10 +4881,11 @@
 ;; NOT REWRITTEN YET!!!!!
 
 ;; runspatt is a comma delimited list of run patterns
 ;; keypatt-alist must contain *all* keys with an associated pattern: '( ("KEY1" "%") .. )
 (define (db:extract-ods-file dbstruct outputfile keypatt-alist runspatt pathmod)
+  (assert #f "FATAL: call to db:extract-ods-file which is not ported yet.")
   (let* ((keysstr  (string-intersperse (map car keypatt-alist) ","))
 	 (keyqry   (string-intersperse (map (lambda (p)(conc (car p) " LIKE ? ")) keypatt-alist) " AND "))
 	 (numkeys  (length keypatt-alist))
 	 (test-ids '())
 	 (dbdat    (db:get-db dbstruct))