Overview
| Comment: | Fixed merge issue |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | multi-area |
| Files: | files | file ages | folders |
| SHA1: |
e75422051c0f94ec3899f775511e65f6 |
| User & Date: | matt on 2015-04-12 21:01:33 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-04-12
| ||
| 21:03 | Minor merge from v1.60 prior to more big changes: check-in: a72834e9cd user: matt tags: multi-area | |
| 21:01 | Fixed merge issue check-in: e75422051c user: matt tags: multi-area | |
|
2015-04-11
| ||
| 15:25 | Merged v1.60 changes into multi-area check-in: f802b44c08 user: matt tags: multi-area | |
Changes
Modified db.scm from [6e99c49744] to [eef4c34f4d].
| ︙ | ︙ | |||
136 137 138 139 140 141 142 | ;; (let ((fdb (db:get-filedb dbstruct))) ;; (filedb:get-path db id))) ;; NB// #f => return dbdir only ;; (was planned to be; zeroth db with name=main.db) ;; (define (db:dbfile-path run-id area-dat) | < | > > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 |
;; (let ((fdb (db:get-filedb dbstruct)))
;; (filedb:get-path db id)))
;; NB// #f => return dbdir only
;; (was planned to be; zeroth db with name=main.db)
;;
(define (db:dbfile-path run-id area-dat)
(let* ((configdat (megatest:area-configdat area-dat))
(dbdir (or (configf:lookup configdat "setup" "dbdir")
(conc (configf:lookup configdat "setup" "linktree") "/.db")))
(toppath (megatest:area-path area-dat))
(link-tree-path (configf:lookup configdat "setup" "linktree"))
(dbpath (configf:lookup configdat "setup" "dbdir"))
(fname (if run-id
(if (eq? run-id 0) "main.db" (conc run-id ".db"))
#f)))
(handle-exceptions
|
| ︙ | ︙ |