Index: dbmod.scm
==================================================================
--- dbmod.scm
+++ dbmod.scm
@@ -46,11 +46,11 @@
 ;; NOTE: This returns only the name "1.db", "main.db", not the path
 ;;
 (define (dbmod:run-id->dbfname run-id)
   (conc (dbfile:run-id->dbnum run-id)".db"))
 
-(define (dbmod:get-dbdir dbstruct run-id)
+(define (dbmod:get-dbdir dbstruct)
   (let* ((areapath (dbr:dbstruct-areapath dbstruct)))
     (conc areapath"/.megatest")))
 
 (define (dbmod:run-id->full-dbfname dbstruct run-id)
   (conc (dbmod:get-dbdir dbstruct run-id)"/"(dbmod:run-id->dbfname run-id)))
@@ -115,12 +115,12 @@
 (define (dbmod:open-dbmoddb areapath run-id dbfname-in init-proc keys
 			    #!key (dbstruct-in #f)
 			    (syncdir 'todisk))
   (let* ((dbstruct     (or dbstruct-in (make-dbr:dbstruct areapath: areapath)))
 	 (dbfname      (or dbfname-in (dbmod:run-id->dbfname run-id)))
-	 (dbpath       (dbmod:get-dbdir dbstruct run-id))             ;; directory where all the .db files are kept
-	 (dbfullname   (dbmod:run-id->full-dbfname dbstruct run-id))
+	 (dbpath       (dbmod:get-dbdir dbstruct))             ;; directory where all the .db files are kept
+	 (dbfullname   (conc dbpath"/"dbfname)) ;; (dbmod:run-id->full-dbfname dbstruct run-id))
 	 (dbexists     (file-exists? dbfullname))
 	 (inmem        (dbmod:open-inmem-db init-proc))
 	 (write-access (file-write-access? dbpath))
 	 (db           (dbfile:with-simple-file-lock
 			(conc dbfullname".lock")