r10227: updates from phoview@lynx

[kmrcl.git] / web-utils.lisp

diff --git a/web-utils.lisp b/web-utils.lisp
index 35611eb0b9739bdd5c0c4b28d376ee84e0f1e008..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
                "&")
@@ -56,34 +56,18 @@
       (if vars
          (let ((first-var (first vars)))
            (concatenate 'string 
-             "?"  (car first-var) "=" (cadr first-var)
+             "?"  (car first-var) "=" (cdr first-var)
              (mapcar-append-string 
               #'(lambda (var) 
-                  (when (and (car var) (cadr var))
+                  (when (and (car var) (cdr var))
                     (concatenate 'string 
-                      amp (car var) "=" (cadr var))))
+                      amp (string-downcase (car var)) "=" (cdr var))))
               (rest vars))))
+       "")
+      (if anchor
+         (concatenate 'string "#" anchor)
        ""))))
 
-(defun make-url-new (page-name &key (base-dir *base-url*) (format :html)
-                              (vars nil))
-  (let ((amp (ecase format
-              (:html "&")
-              ((:xml :ie-xml) "&"))))
-    (concatenate 'string 
-        base-dir page-name
-        (if vars
-            (let ((first-var (first vars)))
-              (concatenate 'string 
-                           "?"  (car first-var) "=" (cadr first-var)
-                           (mapcar-append-string 
-                            #'(lambda (var) 
-                                (when (and (car var) (cadr var))
-                                  (concatenate 'string 
-                                               amp (car var) "=" (cadr var))))
-                            (rest vars))))
-          ""))))
-
 (defun decode-uri-query-string (s)
   "Decode a URI query string field"
   (declare (simple-string s)
@@ -111,3 +95,13 @@
             (t
              (setf (schar new p-new) c)
              (incf p-old))))))
+
+(defun split-uri-query-string (s)
+  (mapcar
+   (lambda (pair)
+     (let ((pos (position #\= pair)))
+       (when pos
+        (cons (subseq pair 0 pos)
+              (when (> (length pair) pos)
+                (decode-uri-query-string (subseq pair (1+ pos))))))))
+   (delimited-string-to-list s #\&)))