r4929: Auto commit for Debian build

[hyperobject.git] / views.lisp

diff --git a/views.lisp b/views.lisp
index 2c2713e54079a34f850fac50dd68040ba18382ed..3d87a7c7d1c3272b47c724d38dc75beb9cbfa90b 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -7,10 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.35 2003/05/14 04:45:05 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $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
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -512,19 +511,28 @@
 
 (defvar +newline-string+ (format nil "~%"))
 
+(defun write-user-name-maybe-plural (obj nitems strm)
+  (write-string
+   (if (> nitems 1)
+       (hyperobject-class-user-name-plural obj)
+       (hyperobject-class-user-name obj))
+   strm))
+
 (defun initialize-text-view (view)
   (setf (list-start-str-or-func view)
        (compile nil
                 (eval '(lambda (obj nitems strm)
-                    (format strm "~a~P:~%"
-                            (hyperobject-class-user-name obj) nitems)))))
+                        (write-user-name-maybe-plural obj nitems strm)
+                        (write-char #\: strm)
+                        (write-char #\Newline strm)))))
   (setf (list-start-indent view) t)
   (setf (obj-data-indent view) t)
   (setf (obj-data-end-str view) +newline-string+))
 
 (defun html-list-start-func (obj nitems strm)
-  (format strm "<p><b>~a~p:</b></p><div class=\""
-         (hyperobject-class-user-name obj) nitems)
+  (write-string "<p><b>" strm)
+  (write-user-name-maybe-plural obj nitems strm)
+  (write-string ":</b></p><div class=\"" strm)
   (write-string (class-name-of obj) strm)
   (write-string "\"><ul>" strm)
   (write-char #\newline strm))
@@ -568,8 +576,9 @@
   (write-char #\< strm)
   (write-string (class-name-of x) strm)
   (write-string "list><title>" strm)
-  (format strm "~A~P:</title> ~%"
-         (hyperobject-class-user-name x) nitems))
+  (write-user-name-maybe-plural x nitems strm)
+  (write-string ":</title>" strm)
+  (write-char #\newline strm))
 
 (defun initialize-xml-view (view)
   (initialize-text-view view)
@@ -635,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))
@@ -645,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)
              "")))