X-Git-Url: http://git.kpe.io/?p=kmrcl.git;a=blobdiff_plain;f=web-utils.lisp;h=0f41c1275fec17e8b58ffcf9fc1ceff9afeaffd5;hp=f777f218b0dbf998cecd2f1db9153c4b35e9a065;hb=7847333b8ae50ed0a99839b484319358d6d8b0a9;hpb=65fa5f1c69413c92a654784135d59ebdbf89966d

diff --git a/web-utils.lisp b/web-utils.lisp
index f777f21..0f41c12 100644
--- a/web-utils.lisp
+++ b/web-utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: web-utils.lisp,v 1.8 2002/10/17 22:25:38 kevin Exp $
+;;;; $Id: web-utils.lisp,v 1.9 2002/10/18 05:14:49 kevin Exp $
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -36,7 +36,8 @@
 (defun user-agent-ie-p (agent)
   "Takes a user-agent string and returns T for Internet Explorer."
   (when (or (string-equal "Microsoft" (subseq agent 0 (length "Microsoft")))
-	    (string-equal "Internet Explore" (subseq agent 0 (length "Internet Explore"))))
+	    (string-equal "Internet Explore" (subseq agent 0 (length "Internet Explore")))
+	    (search "MSIE" agent))
     t))
 
 ;;; URL Functions
@@ -45,15 +46,22 @@
 (defun base-url! (url)
   (setq *base-url* url))
 
-(defun make-url (page-name &key (base-dir *base-url*) (vars nil))
-  (concatenate 'string base-dir page-name
-	       (if vars
-		   (string-trim-last-character
-		    (concatenate 'string "?"
-				 (mapcar-append-string 
-				  #'(lambda (var) 
-				      (when (and (car var) (cadr var))
-					  (concatenate 'string 
-					    (car var) "=" (cadr var) "&")))
-				  vars)))
-		 "")))
+(defun make-url (page-name &key (base-dir *base-url*) (format :html) (vars nil))
+  (let ((amp (case 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))))
+	""))))