r4930: Auto commit for Debian build

[hyperobject.git] / views.lisp

diff --git a/views.lisp b/views.lisp
index f44f800ac352f93834959b600ef07459ea581d8e..2db0a035490fb159d4102cf9759b8ded50a83eb5 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.33 2003/05/14 04:28:09 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $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
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -174,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 "<span class=\"" s) print-func)
@@ -214,6 +211,7 @@
   (ppfc-xml tag name type formatter cdata print-func))
 
 (defun ppfc-html-link (name type formatter cdata nlink print-func)
+  (declare (fixnum nlink))
   (vector-push-extend '(write-char #\< s) print-func)
   (vector-push-extend `(write-string (nth ,(+ nlink nlink) links) s) print-func) 
   (vector-push-extend '(write-char #\> s) print-func)
@@ -322,12 +320,12 @@
       (when (and (view-has-links-p view) (esd-hyperlink slot))
        (push (slot-definition-name slot) links)))
 
-    (setf (obj-data-print-code view) `(lambda (x s links)
-                                      (declare (ignorable links))
-                                      ,@(map 'list #'identity print-func)))
-    
-    (setf (obj-data-func view)
-         (when print-func (compile nil (eval (obj-data-print-code view)))))
+    (when (plusp (length print-func))
+      (setf (obj-data-print-code view) `(lambda (x s links)
+                                        (declare (ignorable links))
+                                        ,@(map 'list #'identity print-func)))
+      (setf (obj-data-func view)
+           (compile nil (eval (obj-data-print-code view)))))
     
     (setf (link-slots view) (nreverse links)))
 
@@ -511,19 +509,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
-                #'(lambda (obj nitems strm)
-                    (format strm "~a~P:~%"
-                            (hyperobject-class-user-name obj) nitems))))
+                (eval '(lambda (obj nitems strm)
+                        (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))
@@ -567,8 +574,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)
@@ -634,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))
@@ -694,6 +704,7 @@
 (defun view-hyperobject (objs view category strm &optional (indent 0) filter
                         subobjects refvars)
   "Display a single or list of hyperobject-class instances and their subobjects"
+  (declare (fixnum indent))
   (let-when (objlist (mklist objs))
     (let ((nobjs (length objlist))
          (*print-pretty* nil)