From 90ec10b4c7b94d247c93a4118f325dae9bb25324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sat, 11 Jun 2022 20:31:13 +0200 Subject: Extend web-query to handle keys without values. --- module/web/query.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'module') diff --git a/module/web/query.scm b/module/web/query.scm index e5057a24..a70903bc 100644 --- a/module/web/query.scm +++ b/module/web/query.scm @@ -8,9 +8,12 @@ (fold (lambda (str list) ;; only split on the first equal. ;; Does HTTP allow multiple equal signs in a data field? - ;; NOTE that this fails if str lacks an equal sign. - (define idx (string-index str #\=)) - (define key (uri-decode (substring str 0 idx) encoding: encoding)) - (define val (uri-decode (substring str (1+ idx)) encoding: encoding)) - (cons* (-> key string->symbol symbol->keyword) val list)) + (let* ((key val + (cond ((string-index str #\=) + => (lambda (idx) + (values (uri-decode (substring str 0 idx) encoding: encoding) + (uri-decode (substring str (1+ idx)) encoding: encoding)))) + (else (let ((v (uri-decode str encoding: encoding))) + (values v v)))))) + (cons* (-> key string->symbol symbol->keyword) val list))) '() (string-split query-string #\&)))) -- cgit v1.2.3