Goodbye mu, hello guile-debbugs!

[software/mumi.git] / mumi / web / render.scm

diff --git a/mumi/web/render.scm b/mumi/web/render.scm
index cc1f35e7bce0b070ce873e734d126a226ca4c991..c67a124292ed138ec90dfa89fd048b3095073187 100644 (file)
--- a/mumi/web/render.scm
+++ b/mumi/web/render.scm
@@ -46,7 +46,7 @@
     ("html" . (text/html))))
 
 (define (render-static-asset path)
-  (render-static-file (assoc-ref %config 'assets-dir) path))
+  (render-static-file (%config 'assets-dir) path))
 
 (define (render-static-file root path)
   ;; PATH is a list of path components
@@ -58,12 +58,13 @@
                                             (file-extension file-name))))
               (call-with-input-file file-name get-bytevector-all))
         (not-found (build-uri 'http
-                              #:host (assoc-ref %config 'host)
-                              #:port (assoc-ref %config 'port)
+                              #:host (%config 'host)
+                              #:port (%config 'port)
                               #:path (string-join path "/" 'prefix))))))
 
-(define (render-html sxml)
-  (list '((content-type . (text/html)))
+(define* (render-html #:key sxml (extra-headers '()))
+  (list (append extra-headers
+                '((content-type . (text/html))))
         (lambda (port)
           (sxml->html sxml port))))
 
@@ -86,8 +87,8 @@
 
 (define (redirect path)
   (let ((uri (build-uri 'http
-                        #:host (assoc-ref %config 'host)
-                        #:port (assoc-ref %config 'port)
+                        #:host (%config 'host)
+                        #:port (%config 'port)
                         #:path (string-append
                                 "/" (encode-and-join-uri-path path)))))
     (list (build-response