diff options
-rw-r--r-- | gn/cache/memoize.scm | 8 | ||||
-rwxr-xr-x | web/webserver.scm | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gn/cache/memoize.scm b/gn/cache/memoize.scm index 42b2163..b79e026 100644 --- a/gn/cache/memoize.scm +++ b/gn/cache/memoize.scm @@ -18,8 +18,8 @@ "Simple memoize just uses alists at this point and does not expire" (let ((result-table '())) (lambda (. args) - (let ((cache-value (assoc args (pk result-table)))) - (if (pk cache-value) + (let ((cache-value (assoc args result-table))) + (if cache-value (cdr cache-value) (let ((result (apply f args))) (set! result-table @@ -29,8 +29,8 @@ "Simple memoize functions that returns values pair and uses alists at this point and does not expire" (let ((result-table '())) (lambda (. args) - (let ((c (assoc args (pk result-table)))) - (if (pk c) + (let ((c (assoc args result-table))) + (if c (values (car (cdr c)) (car (cdr (cdr c)))) (let-values (((r1 r2) (apply f args))) (set! result-table diff --git a/web/webserver.scm b/web/webserver.scm index 6be0890..17f5716 100755 --- a/web/webserver.scm +++ b/web/webserver.scm @@ -66,7 +66,7 @@ (list (append extra-headers '((content-type . (text/html)))) (lambda (port) - (sxml->html (view-doc (pk path) (pk page) rec) port)))) + (sxml->html (view-doc path page rec) port)))) (define (render-json json) (list '((content-type . (application/json))) @@ -117,7 +117,7 @@ (request-method request) (uri-path (request-uri request))) (apply values - ((controller (pk request) body) + ((controller request body) (cons (request-method request) (request-path-components request))))) |