From bfd430a317e69579e79ad0e4d1cb140463c32523 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Sun, 2 Jun 2024 14:38:56 +0200 Subject: [PATCH] Fix function naming --- src/handlers/questionnaire-submit.lisp | 7 ++++--- src/handlers/questionnaire.lisp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/handlers/questionnaire-submit.lisp b/src/handlers/questionnaire-submit.lisp index 02d85e9..9201928 100644 --- a/src/handlers/questionnaire-submit.lisp +++ b/src/handlers/questionnaire-submit.lisp @@ -1,11 +1,12 @@ (in-package :ml-survey/handlers) (defun questionnaire-submit-uri-p (uri) - "Check if the request URI matches the pattern '/survey/'" + "Check if the request URI matches the pattern '/survey//submit'" (let ((parts (split-uri uri))) (and (= (length parts) 3) (string= (first parts) "survey") - (every #'digit-char-p (second parts)) + (and (survey-id-p (parse-integer (second parts))) + (every #'digit-char-p (second parts))) (search "submit" (third parts))))) (defun questionnaire-submit-uri (request) @@ -20,6 +21,6 @@ (define-easy-handler (questionnaire-submit :uri #'questionnaire-submit-uri) nil (let ((post-params (post-parameters* *request*)) - (id (second (split-uri (request-uri*))))) + (id (survey-id (request-uri*)))) (store-response (ensure-data-file-exist id) post-params) (ml-survey/views:questionnaire-submit))) diff --git a/src/handlers/questionnaire.lisp b/src/handlers/questionnaire.lisp index 6c05dd0..3c0572f 100644 --- a/src/handlers/questionnaire.lisp +++ b/src/handlers/questionnaire.lisp @@ -6,7 +6,7 @@ (and (= (length parts) 3) (string= (first parts) "survey") (every #'digit-char-p (second parts)) - (valid-survey-id-p (parse-integer (second parts)))))) + (survey-id-p (parse-integer (second parts)))))) (defun questionnaire-uri (request) (questionnaire-uri-p (request-uri request))) @@ -19,6 +19,6 @@ (t (error "Unsupported language: ~A" lang)))) (define-easy-handler (questionnaire :uri #'questionnaire-uri) (lang) - (let ((survey-id (second (split-uri (request-uri*))))) + (let ((survey-id (survey-id (request-uri*)))) (setf *html-lang* lang) (funcall (return-sus-form lang) survey-id)))