svn: r4904
This commit is contained in:
Jay McCarthy 2006-11-21 03:57:25 +00:00
parent e05ce0bdc4
commit 04c0daf572
2 changed files with 13 additions and 6 deletions

View File

@ -21,13 +21,17 @@
(define (load-configuration table-file-name)
(complete-configuration (directory-part table-file-name) (get-configuration table-file-name)))
; load-configuration-sexpr : sexp -> configuration
(define/kw (load-configuration-sexpr sexpr
; load-configuration-sexpr : string? sexp -> configuration
(define/kw (load-configuration-sexpr web-server-root sexpr
#:other-keys bct-keys)
(define table (parse-configuration-table sexpr))
(define table
(parse-configuration-table sexpr))
(define default-host
(apply-default-functions-to-host-table
web-server-root
(configuration-table-default-host table)))
(apply build-configuration table
(lambda (host)
(configuration-table-default-host table))
(lambda (host) default-host)
bct-keys))
; load-developer-configuration : path -> configuration
@ -64,6 +68,9 @@
(export (open (config : web-config/pervasive^))
(open (new-config : web-config/local^)))))
(provide ; XXX contract
make-make-servlet-namespace
load-configuration-sexpr)
(provide/contract
[complete-configuration (path-string? configuration-table? . -> . configuration?)]
[get-configuration (path-string? . -> . configuration-table?)]
@ -71,6 +78,5 @@
[build-developer-configuration (list? . -> . configuration?)]
[default-configuration-table-path path?]
[update-configuration (configuration? (listof (cons/c symbol? any/c)) . -> . configuration?)]
[load-configuration-sexpr (list? . -> . configuration?)]
[load-configuration (path-string? . -> . configuration?)]
[load-developer-configuration (path-string? . -> . configuration?)]))

View File

@ -222,6 +222,7 @@
(provide ; XXX contract
build-configuration
apply-default-functions-to-host-table
make-make-servlet-namespace)
(provide/contract
[complete-configuration (path-string? configuration-table? . -> . configuration?)]