r9652: improve make-url, rename tests

[kmrcl.git] / web-utils.lisp

diff --git a/web-utils.lisp b/web-utils.lisp
index cc8f52aa0c6327c9522731bbd1218d767d5a1b3f..da7d6b73918bdd50e21b27c9be90628eec154c54 100644 (file)
--- a/web-utils.lisp
+++ b/web-utils.lisp
@@ -45,7 +45,7 @@
 (defun base-url! (url)
   (setq *base-url* url))
 
-(defun make-url (page-name &key (base-dir *base-url*) (format :html) (vars nil))
+(defun make-url (page-name &key (base-dir *base-url*) (format :html) vars anchor)
   (let ((amp (case format
               (:html
                "&")
@@ -61,8 +61,11 @@
               #'(lambda (var) 
                   (when (and (car var) (cdr var))
                     (concatenate 'string 
-                      amp (car var) "=" (cdr var))))
+                      amp (string-downcase (car var)) "=" (cdr var))))
               (rest vars))))
+       "")
+      (if anchor
+         (concatenate 'string "#" anchor)
        ""))))
 
 (defun decode-uri-query-string (s)