rename FORM-QUERY of surflets to FORM-QUERY-LIST

to avoid name puzzlement with the simple-surflet-api that already
exports this name (and we cannot change this, as this is adapted to PLT)
This commit is contained in:
interp 2003-03-09 19:57:56 +00:00
parent 4af92bc379
commit 31f0044e2c
4 changed files with 9 additions and 7 deletions

View File

@ -78,7 +78,7 @@
send-html/finish send-html/finish
send-html send-html
form-query form-query-list
get-bindings get-bindings
extract-bindings extract-bindings
extract-single-binding extract-single-binding

View File

@ -32,7 +32,7 @@
;;; (("button" . "on") ("reply" . "Oh, yes")) ;;; (("button" . "on") ("reply" . "Oh, yes"))
;;; This works only for GET and POST methods. ;;; This works only for GET and POST methods.
(define (form-query q) (define (form-query-list q)
(if q (if q
(parse-html-form-query q) (parse-html-form-query q)
'())) '()))
@ -49,13 +49,15 @@
(let ((request-method (surflet-request-method surflet-request))) (let ((request-method (surflet-request-method surflet-request)))
(cond (cond
((string=? request-method "GET") ((string=? request-method "GET")
(form-query (http-url-search (surflet-request-url surflet-request)))) (form-query-list (http-url-search
(surflet-request-url surflet-request))))
((string=? request-method "POST") ((string=? request-method "POST")
(or (cached-bindings surflet-request) (or (cached-bindings surflet-request)
(let* ((content-length (get-content-length (surflet-request-headers surflet-request))) (let* ((content-length (get-content-length
(surflet-request-headers surflet-request)))
(input-port (surflet-request-input-port surflet-request)) (input-port (surflet-request-input-port surflet-request))
(form-data (read-string content-length input-port))) (form-data (read-string content-length input-port)))
(let ((form-bindings (form-query form-data))) (let ((form-bindings (form-query-list form-data)))
(obtain-lock *cache-lock*) (obtain-lock *cache-lock*)
(set! *POST-bindings-cache* (cons (cons (make-weak-pointer surflet-request) (set! *POST-bindings-cache* (cons (cons (make-weak-pointer surflet-request)
form-bindings) form-bindings)

View File

@ -25,7 +25,7 @@
(hr) (hr)
(p (URL "/" "Return to main menu") (br) (p (URL "/" "Return to main menu") (br)
(URL "add-html.scm" "Start new calculation.")))))))) (URL "add-html.scm" "Start new calculation."))))))))
(let* ((bindings (form-query (let* ((bindings (form-query-list
(http-url-search (surflet-request-url result)))) (http-url-search (surflet-request-url result))))
(number (string->number (number (string->number
(extract-single-binding "number" bindings)))) (extract-single-binding "number" bindings))))

View File

@ -55,7 +55,7 @@
,(make-submit-button)) ,(make-submit-button))
(hr) (hr)
(p (URL "/" "Return to main menu."))))))) (p (URL "/" "Return to main menu.")))))))
(bindings (form-query (http-url-search (surflet-request-url req))))) (bindings (get-bindings req)))
(input-field-value byte-input-fields bindings))) (input-field-value byte-input-fields bindings)))
(define (main req) (define (main req)