X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=4b0867e0ca5ec3b19cb40e2f9467a9f6854ef654;hb=fb79a796c6ff0b90aedc377a804b48a7b543f65b;hp=f44f800ac352f93834959b600ef07459ea581d8e;hpb=4675e305339bd8b9f4cc15eb5f2da6036907a301;p=hyperobject.git

diff --git a/views.lisp b/views.lisp
index f44f800..4b0867e 100644
--- 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.47 2003/05/22 21:03:52 kevin Exp $
 ;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
  
 (in-package :hyperobject)
@@ -41,29 +40,29 @@
 		   :accessor file-start-str)
    (file-end-str :type (or string null) :initform nil :initarg :file-end-str
 		 :accessor file-end-str)
-   (list-start-str-or-func :type (or string function null) :initform nil
-			   :initarg :list-start-str-or-func
-		      :accessor list-start-str-or-func)
+   (list-start-printer :type (or string function null) :initform nil
+			   :initarg :list-start-printer
+		      :accessor list-start-printer)
    (list-start-indent :initform nil :initarg :list-start-indent
 		      :accessor list-start-indent)
-   (list-end-str-or-func :type (or string function null) :initform nil
-			 :initarg :list-end-str-or-func
-		    :accessor list-end-str-or-func)
+   (list-end-printer :type (or string function null) :initform nil
+			 :initarg :list-end-printer
+		    :accessor list-end-printer)
    (list-end-indent :initform nil :initarg :list-end-indent
 		    :accessor list-end-indent)
-   (obj-start-str-or-func :type (or string function null) :initform nil :initarg :obj-start-str-or-func
-		     :accessor obj-start-str-or-func)
+   (obj-start-printer :type (or string function null) :initform nil :initarg :obj-start-printer
+		     :accessor obj-start-printer)
    (obj-start-indent :initform nil :initarg :obj-start-indent
 		     :accessor obj-start-indent)
-   (obj-end-str-or-func :type (or string function null) :initform nil :initarg :obj-end-str-or-func
-		   :accessor obj-end-str-or-func)
+   (obj-end-printer :type (or string function null) :initform nil :initarg :obj-end-printer
+		   :accessor obj-end-printer)
    (obj-end-indent :initform nil :initarg :obj-end-indent
 		   :accessor obj-end-indent)
    (obj-data-indent :initform nil :initarg :obj-data-indent
 		    :accessor obj-data-indent)
-   (obj-data-func :type (or function null) :initform nil
-			:initarg :obj-data-func
-			:accessor obj-data-func)
+   (obj-data-printer :type (or function null) :initform nil
+			:initarg :obj-data-printer
+			:accessor obj-data-printer)
    (obj-data-print-code :type (or function null) :initform nil
 		  :initarg :obj-data-print-code
 		  :accessor obj-data-print-code)
@@ -135,7 +134,7 @@
 				 :category :compact-text)))
        view))
     ((consp view-def)
-     (eval `(make-instance ,view-def)))
+     (apply #'make-instance 'object-view view-def))
     (t
      (error "Invalid parameter to make-object-view: ~S" view-def))))
 
@@ -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)
@@ -214,6 +219,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)
@@ -273,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
@@ -290,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)
@@ -298,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)))
@@ -322,12 +331,12 @@
       (when (and (view-has-links-p view) (esd-hyperlink slot))
 	(push (slot-definition-name slot) links)))
 
+    (vector-push-extend 'x print-func) ;; return object
     (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)))))
+    (setf (obj-data-printer view)
+	  (compile nil (eval (obj-data-print-code view))))
     
     (setf (link-slots view) (nreverse links)))
 
@@ -364,143 +373,6 @@
      (setf (link-href-end view) "html:a")
      (setf (link-ampersand view) "&amp;"))))
 
-#+ignore
-(defun initialize-view-by-category (obj-cl view)
-  "Initialize a view based upon a preset category"
-  (let ((fmtstr nil)
-	(first-field t)
-	(value-func '())
-	(links '())
-	(category (category view)))
-
-    (unless (in category :compact-text :compact-text-labels
-		:html :html-labels :html-link-labels
-		:xhtml :xhtml-labels :xhtml-link-labels
-		:xml :xml-labels :xml-link :ie-xml-link
-		:xml-link-labels :ie-xml-link-labels)
-      (error "Unknown view category ~A" category))
-    
-    (unless (slots view)
-      (setf (slots view) (default-print-slots obj-cl)))
-    (dolist (slot-name (slots view))
-      (let ((slot (find-slot-by-name obj-cl slot-name)))
-	(unless slot
-	  (error "Slot ~A is not found in class ~S" slot-name obj-cl))
-	(let* ((name (slot-definition-name slot))
-	       (namestr-lower (string-downcase (symbol-name name)))
-	       (xml-namestr (escape-xml-string namestr-lower))
-	       (xml-tag (escape-xml-string namestr-lower))
-	       (type (slot-value slot 'type))
-	       (print-formatter (esd-print-formatter slot)))
-
-	  (cond
-	    (first-field
-	     (setq fmtstr "")
-	     (setq first-field nil))
-	    (t
-	     (string-append fmtstr " ")))
-
-	  (let ((value-fmt
-		 (case type
-		   ((or :integer :fixnum)
-		    "~d")
-		   (:boolean
-		    "~a")
-		   (otherwise
-		    "~a"))))
-	    (case category
-	      (:compact-text
-	       (string-append fmtstr value-fmt))
-	      (:compact-text-labels
-	       (string-append fmtstr namestr-lower " " value-fmt))
-	      ((or :html :xhtml)
-	       (string-append fmtstr (concatenate 'string "<span class=\"" namestr-lower "\">" value-fmt "</span>")))
-	      (:xml
-	       (string-append fmtstr (concatenate 'string "<" namestr-lower ">" value-fmt "</" namestr-lower ">")))
-	      (:html-labels
-	       (string-append fmtstr (concatenate 'string "<span class=\"label\">" namestr-lower "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>")))
-	      (:xhtml-labels
-	       (string-append fmtstr (concatenate 'string "<span class=\"label\">" xml-namestr "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>")))
-	      (:xml-labels
-	       (string-append fmtstr (concatenate 'string "<label>" xml-namestr "</label> <" xml-tag ">" value-fmt "</" xml-tag ">")))
-	      ((or :html-link :xhtml-link)
-	       (push name links)
-	       (if (esd-hyperlink slot)
-		   (string-append fmtstr "<~~a>" value-fmt "</~~a>")
-		   (string-append fmtstr (concatenate 'string "<span class=\"" namestr-lower "\">" value-fmt "</span>"))))
-	      ((or :xml-link :ie-xml-link)
-	       (push name links)
-	       (if (esd-hyperlink slot)
-		   (string-append fmtstr "<~~a>" value-fmt "</~~a>")
-		   (string-append fmtstr (concatenate 'string "<" xml-tag ">" value-fmt "</" xml-tag ">"))))
-	      (:html-link-labels
-	       (push name links)
-	       (if (esd-hyperlink slot)
-		   (string-append fmtstr "<span class=\"label\">" namestr-lower "</span> <~~a>" value-fmt "</~~a>")
-		   (string-append fmtstr (concatenate 'string "<span class=\"label\">" namestr-lower "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>"))))
-	      (:xhtml-link-labels
-	       (push name links)
-	       (if (esd-hyperlink slot)
-		   (string-append fmtstr "<span class=\"label\">" xml-namestr "</span> <~~a>" value-fmt "</~~a>")
-		   (string-append fmtstr (concatenate 'string "<span class=\"label\">" xml-namestr "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>"))))
-	      ((or :xml-link-labels :ie-xml-link-labels)
-	       (push name links)
-	       (if (esd-hyperlink slot)
-		   (string-append fmtstr "<label>" xml-namestr "</label> <~~a>" value-fmt "</~~a>")
-		   (string-append fmtstr (concatenate 'string "<label>" xml-namestr "</label> <" xml-tag ">" value-fmt "</" xml-tag ">")))))
-	    ) ;; let value-fmt
-	    
-	  (let ((func (if print-formatter
-		  `(,print-formatter (slot-value x (quote ,name)))
-		  `(slot-value x (quote ,name)))))
-	    (when (and (in category :xml :xhtml :xml-link :xhtml-link
-			   :xml-labels :ie-xml-labels
-			   :xhtml-link-labels :xml-link-labels :ie-xml-link
-			   :ie-xml-link-labels)
-		       (or print-formatter
-			   (lisp-type-is-a-string type)))
-	      (setq func `(kmrcl:xml-cdata ,func)))
-	    (push func value-func))
-	  )))
-	  
-    (when value-func
-      (setq value-func
-	    (compile nil (eval `(lambda (x) (values ,@(nreverse value-func)))))))
-
-    (setf (obj-data-fmtstr view) fmtstr)
-    (setf (obj-data-value-func view) value-func)
-    (setf (link-slots view) (nreverse links))
-    
-    (case category
-      ((or :compact-text :compact-text-labels)
-       (initialize-text-view view))
-      ((or :html :xhtml :html-labels :xhtml-labels)
-       (initialize-html-view view))
-      ((or :xml :xml-labels)
-       (initialize-xml-view view))
-      ((or :html-link :html-link-labels)
-       (initialize-html-view view)
-       (setf (link-href-start view) "a href=")
-       (setf (link-href-end view) "a")
-       (setf (link-ampersand view) "&"))
-      ((or :xhtml-link :xhtml-link-labels)
-       (initialize-html-view view)
-       (setf (link-href-start view) "a href=")
-       (setf (link-href-end view) "a")
-       (setf (link-ampersand view) "&amp;"))
-      ((or :xml-link :xml-link-labels)
-       (initialize-xml-view view)
-       (setf (link-href-start view)
-	     "xmllink xlink:type=\"simple\" xlink:href=")
-       (setf (link-href-end view) "xmllink")
-       (setf (link-ampersand view) "&amp;"))
-      ((or :ie-xml-link :ie-xml-link-labels)
-       (initialize-xml-view view)
-       (setf (link-href-start view) "html:a href=")
-       (setf (link-href-end view) "html:a")
-       (setf (link-ampersand view) "&amp;"))))
-  view)
-
 
 ;;;; *************************************************************************
 ;;;;  View Data Format Section
@@ -511,19 +383,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)
+  (setf (list-start-printer 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))
@@ -533,28 +414,28 @@
   (setf (file-start-str view) (format nil "<html><body>~%"))
   (setf (file-end-str view) (format nil "</body><html>~%"))
   (setf (list-start-indent view) t)
-  (setf (list-start-str-or-func view) #'html-list-start-func)
-  (setf (list-end-str-or-func view) (format nil "</ul></div>~%"))
+  (setf (list-start-printer view) #'html-list-start-func)
+  (setf (list-end-printer view) (format nil "</ul></div>~%"))
   (setf (list-end-indent view) t)
   (setf (obj-start-indent view) t)
-  (setf (obj-start-str-or-func view) "<li>")
+  (setf (obj-start-printer 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-end-printer view)  (format nil "</li>~%"))
+  (setf (obj-data-indent view) nil))
 
 (defun initialize-xhtml-view (view)
   (initialize-text-view view)
   (setf (file-start-str view) (format nil "<html><body>~%"))
   (setf (file-end-str view) (format nil "</body><html>~%"))
   (setf (list-start-indent view) t)
-  (setf (list-start-str-or-func view) #'html-list-start-func)
-  (setf (list-end-str-or-func view) (format nil "</ul></div>~%"))
+  (setf (list-start-printer view) #'html-list-start-func)
+  (setf (list-end-printer view) (format nil "</ul></div>~%"))
   (setf (list-end-indent view) t)
   (setf (obj-start-indent view) t)
-  (setf (obj-start-str-or-func view) "<li>")
+  (setf (obj-start-printer 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-end-printer view) (format nil "</li>~%"))
+  (setf (obj-data-indent view) nil))
 
 (defun xmlformat-list-end-func (x strm)
   (write-string "</" strm)
@@ -567,19 +448,20 @@
   (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)
   (setf (file-start-str view) "") ; (std-xml-header)
   (setf (list-start-indent view)  t)
-  (setf (list-start-str-or-func view) #'xmlformat-list-start-func)
+  (setf (list-start-printer view) #'xmlformat-list-start-func)
   (setf (list-end-indent view) t)
-  (setf (list-end-str-or-func view) #'xmlformat-list-end-func)
-  (setf (obj-start-str-or-func view) (format nil "<~(~a~)>" (object-class-name view)))
+  (setf (list-end-printer view) #'xmlformat-list-end-func)
+  (setf (obj-start-printer view) (format nil "<~(~a~)>" (object-class-name view)))
   (setf (obj-start-indent view) t)
-  (setf (obj-end-str-or-func view) (format nil "</~(~a~)>~%" (object-class-name view)))
+  (setf (obj-end-printer view) (format nil "</~(~a~)>~%" (object-class-name view)))
   (setf (obj-end-indent view) nil)
   (setf (obj-data-indent view) nil))
 
@@ -599,7 +481,7 @@
 (defun fmt-list-start (obj view strm indent num-items)
   (when (list-start-indent view)
     (indent-spaces indent strm))
-  (awhen (list-start-str-or-func view)
+  (awhen (list-start-printer view)
 	 (if (stringp it)
 	     (write-string it strm)
 	     (funcall it obj num-items strm))))
@@ -608,7 +490,7 @@
   (declare (ignore num-items))
   (when (list-end-indent view)
       (indent-spaces indent strm))
-  (awhen (list-end-str-or-func view)
+  (awhen (list-end-printer view)
 	 (if (stringp it)
 	     (write-string it strm)
 	     (funcall it obj strm))))
@@ -618,7 +500,7 @@
 (defun fmt-obj-start (obj view strm indent)
   (when (obj-start-indent view)
     (indent-spaces indent strm))
-  (awhen (obj-start-str-or-func view)
+  (awhen (obj-start-printer view)
 	 (if (stringp it)
 	     (write-string it strm)
 	     (funcall it obj strm))))
@@ -626,28 +508,31 @@
 (defun fmt-obj-end (obj view strm indent)
   (when (obj-end-indent view)
     (indent-spaces indent strm))
-  (awhen (obj-end-str-or-func view)
+  (awhen (obj-end-printer view)
 	 (if (stringp it)
 	     (write-string it strm)
 	     (funcall it obj strm))))
   
 ;;; 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))
@@ -662,7 +547,7 @@
 	 (write-string it strm)))
 
 (defun fmt-obj-data-plain (obj view strm)
-  (awhen (obj-data-func view)
+  (awhen (obj-data-printer view)
 	 (funcall it obj strm nil)))
 
 (defun fmt-obj-data-with-link (obj view strm refvars)
@@ -674,7 +559,7 @@
 				    (append (link-parameters it) refvars))
 		   refvalues)
 	     (push (make-link-end obj view name) refvalues)))
-    (funcall (obj-data-func view) obj strm (nreverse refvalues))))
+    (funcall (obj-data-printer view) obj strm (nreverse refvalues))))
 
 (defun obj-data (obj view)
   "Returns the objects data as a string. Used by common-graphics outline function"
@@ -694,6 +579,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)