diff --git a/pollen/private/project-server-routes.rkt b/pollen/private/project-server-routes.rkt index 613a27c..d97da62 100644 --- a/pollen/private/project-server-routes.rkt +++ b/pollen/private/project-server-routes.rkt @@ -56,7 +56,9 @@ (define/contract (route-wrapper route-proc) (procedure? . -> . procedure?) (λ(req . string-args) - (logger req) + (logger req) + ;; `flatten` here because servlet's route matcher might send a list of lists + ;; for "before and after" matches, like `((string-arg) ... "in" (string-arg) ...)` (define path (apply build-path (current-project-root) (flatten string-args))) (response/xexpr+doctype (route-proc path)))) diff --git a/pollen/private/project-server.rkt b/pollen/private/project-server.rkt index a7a1f67..edbfc9b 100755 --- a/pollen/private/project-server.rkt +++ b/pollen/private/project-server.rkt @@ -17,8 +17,8 @@ (dispatch-rules [((string-arg) ... (? (λ(x) (equal? "" x)))) route-index] ; last element of a "/"-terminated url is "" [((string-arg) ... (? pagetree-source?)) route-dashboard] - [("in" (string-arg) ...) route-in] - [("out" (string-arg) ...) route-out] + [((string-arg) ... "in" (string-arg) ...) route-in] + [((string-arg) ... "out" (string-arg) ...) route-out] [else route-default])) (message (format "Welcome to Pollen ~a" pollen:version) (format "(Racket ~a)" (version))) diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 3c22c59..2f7f1ad 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1471443458 +1471898388