X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=3d87a7c7d1c3272b47c724d38dc75beb9cbfa90b;hb=8df04510a35e76a04399872d24ccdfa322a763ff;hp=b5594a7a8cf71e8e004913f3b6509c7290f66c52;hpb=04f829aab1e5caaefe60391f756e7a5db2d1282b;p=hyperobject.git diff --git a/views.lisp b/views.lisp index b5594a7..3d87a7c 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.39 2003/05/14 06:54:04 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg ;;;; ************************************************************************* @@ -576,7 +576,7 @@ (write-char #\< strm) (write-string (class-name-of x) strm) (write-string "list>" 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,6 +644,24 @@ ;;; Object Data (defun make-link-start (view fieldfunc fieldvalue refvars) + (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-start-old (view fieldfunc fieldvalue refvars) (format nil "~a\"~a?func=~a~akey=~a~a\"" (link-href-start view) (make-url (link-page-name view)) @@ -654,7 +672,7 @@ (dolist (var refvars) (string-append varstr (link-ampersand view) - (format nil "~a=~a" (car var) (cadr var)))) + (format nil "~a=~a" (car var) (cdr var)))) varstr) "")))