X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=2db0a035490fb159d4102cf9759b8ded50a83eb5;hb=43d8629dc778adb94ffed0220e73b60817b0f958;hp=b5594a7a8cf71e8e004913f3b6509c7290f66c52;hpb=04f829aab1e5caaefe60391f756e7a5db2d1282b;p=hyperobject.git diff --git a/views.lisp b/views.lisp index b5594a7..2db0a03 100644 --- a/views.lisp +++ b/views.lisp @@ -7,7 +7,7 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Apr 2000 ;;;; -;;;; $Id: views.lisp,v 1.36 2003/05/14 05:29:48 kevin Exp $ +;;;; $Id: views.lisp,v 1.40 2003/05/14 07:00:47 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg ;;;; ************************************************************************* @@ -173,10 +173,8 @@ (typecase data (string (write-string data strm)) - (number - (write-string (write-to-string data) strm)) (t - (format strm "~A" data))))) + (write-string (write-to-string data) strm))))) (defun ppfc-html (title name type formatter cdata print-func) (vector-push-extend '(write-string "" strm) - (write-user-name-maybe-plural obj nitems strm) + (write-user-name-maybe-plural x nitems strm) (write-string ":" strm) (write-char #\newline strm)) @@ -644,20 +642,22 @@ ;;; Object Data (defun make-link-start (view fieldfunc fieldvalue refvars) - (format nil "~a\"~a?func=~a~akey=~a~a\"" - (link-href-start view) - (make-url (link-page-name view)) - fieldfunc - (link-ampersand view) fieldvalue - (if refvars - (let ((varstr "")) - (dolist (var refvars) - (string-append - varstr (link-ampersand view) - (format nil "~a=~a" (car var) (cadr var)))) - varstr) - ""))) - + (with-output-to-string (s) + (write-string (link-href-start view) s) + (write-char #\" s) + (write-string (make-url (link-page-name view)) s) + (write-string "?func=" s) + (write-string fieldfunc s) + (write-string (link-ampersand view) s) + (write-string "key=" s) + (write-string fieldvalue s) + (dolist (var refvars) + (write-string (link-ampersand view) s) + (write-string (car var) s) + (write-char #\= s) + (write-string (cdr var) s)) + (write-char #\" s))) + (defun make-link-end (obj view fieldname) (declare (ignore obj fieldname)) (link-href-end view))