X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=e7fb1d62462ff182bf919503ac6c9912fe6e00a0;hb=05aebff043c86b2c29831e2db484d850e124bb07;hp=caf7ad3747831cc5a4ef2808e04abeef1408d040;hpb=7f6cbd20ca01e6f29b4fa7d68a0908864e400320;p=hyperobject.git

diff --git a/views.lisp b/views.lisp
index caf7ad3..e7fb1d6 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,10 +7,9 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.34 2003/05/14 04:38:36 kevin Exp $
-;;;;
-;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
+;;;; $Id: views.lisp,v 1.43 2003/05/14 21:15:11 kevin Exp $
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -161,6 +160,17 @@
     )
   )
 
+(defmacro write-simple (v s)
+  `(typecase v
+    (string
+     (write-string ,v ,s))
+    #+allegro
+    (fixnum
+     (excl::print-fixnum ,s 10 ,v)) 
+    (symbol
+     (write-string (symbol-name ,v) ,s))
+    (t
+     (write-string (write-to-string ,v) ,s))))
 
 (defun write-ho-value (obj name type formatter cdata strm)
   (declare (ignorable type))
@@ -171,13 +181,8 @@
 	 (data (if cdata
 		   (kmrcl:xml-cdata fmt-data)
 		   fmt-data)))
-    (typecase data
-      (string
-       (write-string data strm))
-      (number
-       (write-string (write-to-string data) strm))
-      (t
-       (format strm "~A" data)))))
+    (write-simple data strm)))
+
 
 (defun ppfc-html (title name type formatter cdata print-func)
   (vector-push-extend '(write-string "<span class=\"" s) print-func)
@@ -274,6 +279,8 @@
 	   (ppfc-xml xml-tag name type formatter cdata print-func)))
       (:html-link-labels
        (if hyperlink
+	   (ppfc-html-link-labels namestr-lower name type formatter cdata nlink
+				  print-func)
 	   (ppfc-html-labels namestr-lower name type formatter cdata print-func)))
       (:xhtml-link-labels
        (if hyperlink
@@ -291,7 +298,7 @@
 
 (defun view-has-links-p (view)
   (in (category view) :html-link :xhtml-link :xml-link :ie-xml-link
-      :html-link-labels :xhtml-links-labels :xml-link-labels
+      :html-link-labels :xhtml-link-labels :xml-link-labels
       :ie-xml-link-labels))
 
 (defun initialize-view-by-category (obj-cl view)
@@ -299,6 +306,7 @@
   (unless (in (category view) :compact-text :compact-text-labels
 	      :html :html-labels :html-link-labels
 	      :xhtml :xhtml-labels :xhtml-link-labels
+	      :xhtml-link :html-link
 	      :xml :xml-labels :xml-link :ie-xml-link
 	      :xml-link-labels :ie-xml-link-labels)
     (error "Unknown view category ~A" (category view)))
@@ -323,12 +331,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)))
 
@@ -512,19 +520,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))
@@ -541,7 +558,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view)  (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun initialize-xhtml-view (view)
   (initialize-text-view view)
@@ -555,7 +572,7 @@
   (setf (obj-start-str-or-func view) "<li>")
   (setf (obj-end-indent view)  t)
   (setf (obj-end-str-or-func view) (format nil "</li>~%"))
-  (setf (obj-data-indent view) t))
+  (setf (obj-data-indent view) nil))
 
 (defun xmlformat-list-end-func (x strm)
   (write-string "</" strm)
@@ -568,8 +585,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,21 +652,24 @@
   
 ;;; 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)
-	      "")))
 
+(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-simple fieldfunc s)
+    (write-string (link-ampersand view) s)
+    (write-string "key=" s)
+    (write-simple fieldvalue s)
+    (dolist (var refvars)
+      (write-string (link-ampersand view) s)
+      (write-simple (car var) s)
+      (write-char #\= s)
+      (write-simple (cdr var) s))
+    (write-char #\" s)))
+  
 (defun make-link-end (obj view fieldname)
   (declare (ignore obj fieldname))
   (link-href-end view))