X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=web-utils-aserve.lisp;h=6ace751136a96a65b4b326ce73d4f08272bde574;hb=933317b82c3441aa75c2c5375e25d1929bc80045;hp=92a89bdaa702d6cb72ee6f170b06c7dca06aa5d7;hpb=5e5cc3c20a925d8af5de153a118fdaf0792dd7e2;p=kmrcl.git
diff --git a/web-utils-aserve.lisp b/web-utils-aserve.lisp
index 92a89bd..6ace751 100644
--- a/web-utils-aserve.lisp
+++ b/web-utils-aserve.lisp
@@ -7,18 +7,18 @@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: web-utils-aserve.lisp,v 1.1 2002/10/06 13:21:47 kevin Exp $
+;;;; $Id: web-utils-aserve.lisp,v 1.10 2002/10/18 07:28:57 kevin Exp $
;;;;
-;;;; This file, part of Webutils, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
;;;;
-;;;; Webutils users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the GNU General Public License.
+;;;; KMRCL users are granted the rights to distribute and use this software
+;;;; as governed by the terms of the Lisp Lesser GNU Public License
+;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
;;;; *************************************************************************
-
-(in-package :webutils)
-(declaim (optimize (speed 3) (safety 1)))
+(in-package :kmrcl)
+(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
;;; AllegroServe interaction functions
@@ -60,64 +60,86 @@
(with-tag-attribute "font" (format nil "size=\"~a\"" size)
(princ-http text)))
-(defmacro with-link ((href xml linktype) &rest body)
- (declare (ignore linktype))
+(defmacro with-link ((href &key (format :html)) &rest body)
; (format *html-stream* "Return to Home")
; (format *html-stream* "Return to Home")
- `(if ,xml
- (progn
- (princ-http "")
- ,@body
- (princ-http ""))
- (progn
- (princ-http "")
- ,@body
- (princ-http ""))))
-
-(defun home-link (&key (xml nil) (vars nil))
- (princ-http "Return to ")
- (with-link ((make-url "index.html" :vars vars) xml "homelink")
- (princ-http "Browser Home"))
- (princ-http "