;;;; 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.44 2003/05/14 21:18:12 kevin Exp $
;;;;
+;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
;;;; *************************************************************************
(in-package :hyperobject)
)
)
+(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))
(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)
(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)
(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
(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)
(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)))
(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)))
(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))
(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)
(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)
(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)
;;; 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))
(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)