X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=9caf7d0b72cc722bbe955981f119b8f7d33b1375;hb=131b7fa77fb2a885efe336da1ae1f05753c0c313;hp=387fa7396c706497a05308637ed4c40eaec900bc;hpb=af822a09967eb5334753e5c1207702bf63198313;p=cl-modlisp.git

diff --git a/utils.lisp b/utils.lisp
index 387fa73..9caf7d0 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: utils.lisp,v 1.6 2003/07/11 02:38:00 kevin Exp $
+;;;; $Id$
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
@@ -19,17 +19,22 @@
     (:text "text/plain")
     (otherwise fmt)))
 			   
-(defmacro with-ml-page ((&key (format :html) (precompute t)) &body body)
-  (let ((fmt (gensym))
-	(precomp (gensym))
-	(result (gensym))
-	(outstr (gensym))
-	(stream (gensym)))
+(defmacro with-ml-page ((&key (format :html) (precompute t) headers)
+			&body body)
+  (let ((fmt (gensym "FMT-"))
+	(precomp (gensym "PRE-"))
+	(result (gensym "RES-"))
+	(outstr (gensym "STR-"))
+	(stream (gensym "STRM-"))
+	(hdr (gensym "HDR-")))
     `(let ((,fmt ,format)
 	   (,precomp ,precompute)
-	   ,result ,outstr)
+	   ,result ,outstr ,stream)
+       (declare (ignorable ,stream))
        (write-header-line "Status" "200 OK")
        (write-header-line "Content-Type" (format-string ,fmt))
+       (dolist (,hdr ,headers)
+	 (write-header-line (car ,hdr) (cdr ,hdr)))
        (unless ,precomp
 	 (write-string "end" *modlisp-socket*)
 	 (write-char #\NewLine *modlisp-socket*))
@@ -44,7 +49,6 @@
 	 (write-header-line "Content-Length" 
 			    (write-to-string (length ,outstr)))
 	 (write-header-line "Keep-Socket" "1")
-	 (write-header-line "Keep-Alive" "timeout=15, max=99")
 	 (write-header-line "Connection" "Keep-Alive")
 	 (write-string "end" *modlisp-socket*)
 	 (write-char #\NewLine *modlisp-socket*)
@@ -52,14 +56,18 @@
 	 (finish-output *modlisp-socket*)
 	 (setq *close-modlisp-socket* nil))
 	(t
-	 (setq *close-modlisp-socket* t)
-	 (finish-output *modlisp-socket*)))
+	 (finish-output *modlisp-socket*)
+	 (setq *close-modlisp-socket* t)))
        ,result)))
 
 (defun redirect-to-location (url)
-  (write-header-line "Status" "302 Redirect")
+  (write-header-line "Status" "307 Temporary Redirect")
   (write-header-line "Location" url)
+  ;;(write-header-line "Keep-Socket" "1")
+  ;;(write-header-line "Connection" "Keep-Alive")
+  (write-string "end" *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*)
+  (force-output *modlisp-socket*)
   (setq *close-modlisp-socket* t))
 
 (defun output-ml-page (format html)
@@ -67,11 +75,11 @@
   (write-header-line "Content-Type" (format-string format))
   (write-header-line "Content-Length" (format nil "~d" (length html)))
   (write-header-line "Keep-Socket" "1")
-  (write-header-line "Keep-Alive" "timeout=15, max=99")
   (write-header-line "Connection" "Keep-Alive")
   (write-string "end" *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*)
   (write-string html *modlisp-socket*)
+  (force-output *modlisp-socket*)
   (setq *close-modlisp-socket* nil))
 
 (defun output-html-page (str)
@@ -82,7 +90,7 @@
 
 ;; Utility functions for library users
 
-(defun posted-to-alist (posted-string)
+(defun query-to-alist (posted-string &key (keyword t))
   "Converts a posted string to an assoc list of keyword names and values,
 \"a=1&bc=demo\" => ((:a . \"1\") (:bc . \"demo\"))"
   (when posted-string
@@ -92,7 +100,11 @@
 	(let ((name-val-list (kmrcl:delimited-string-to-list name=val #\=)))
 	  (if (= 2 (length name-val-list))
 	    (destructuring-bind (name val) name-val-list
-	      (push (cons (kmrcl:ensure-keyword name)
+	      (push (cons (if keyword
+			      (kmrcl:ensure-keyword name)
+			    name)
 			  (kmrcl:decode-uri-query-string val))
 		    alist))
 	    (cmsg-c :debug "Invalid number of #\= in ~S" name-val-list)))))))
+
+