X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=views.lisp;h=a80c1e9a58051331c17fae8530096be424fd0241;hb=9e616a490d6d4f03682a7bd7e9ea6587fecf2015;hp=a62baf0c40c78bdc072eefaf00f1b9c25f0a65f8;hpb=cda49a13fa66d935f4d7db644364cc741b9c1c4c;p=hyperobject.git
diff --git a/views.lisp b/views.lisp
index a62baf0..a80c1e9 100644
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
;;;; Programmer: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: views.lisp,v 1.3 2002/11/29 05:05:29 kevin Exp $
+;;;; $Id: views.lisp,v 1.11 2002/12/09 10:39:38 kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
@@ -16,14 +16,27 @@
(in-package :hyperobject)
(eval-when (:compile-toplevel :execute)
- (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
+ (declaim (optimize (speed 2) (safety 2) (compilation-speed 0) (debug 2))))
;;;; *************************************************************************
;;;; Metaclass Intialization
;;;; *************************************************************************
-(defun process-views (cl)
+(defun finalize-hyperlinks (cl)
+ (let ((hyperlinks '()))
+ (dolist (esd (class-slots cl))
+ (awhen (slot-value esd 'hyperlink)
+ (push
+ (make-instance 'hyperlink
+ :name (slot-definition-name esd)
+ :lookup it
+ :link-parameters (slot-value esd 'hyperlink-parameters))
+ hyperlinks)))
+ (setf (slot-value cl 'hyperlinks) hyperlinks)))
+
+
+(defun finalize-views (cl)
"Calculate all view slots for a hyperobject class"
(let ((fmtstr-text "")
(fmtstr-html "")
@@ -40,7 +53,7 @@
(xmlvalue-func '())
(classname (class-name cl))
(package (symbol-package (class-name cl)))
- (references nil))
+ (hyperlinks nil))
(declare (ignore classname))
(check-type (slot-value cl 'print-slots) list)
(dolist (slot-name (slot-value cl 'print-slots))
@@ -88,15 +101,15 @@
(string-append fmtstr-html-labels html-label-str)
(string-append fmtstr-xml-labels xml-label-str)
- (if (slot-value slot 'reference)
+ (if (slot-value slot 'hyperlink)
(progn
(string-append fmtstr-html-ref "<~~a>" value-fmt "")
(string-append fmtstr-xml-ref "<~~a>" value-fmt "")
(string-append fmtstr-html-ref-labels "" namestr-lower " <~~a>" value-fmt "")
(string-append fmtstr-xml-ref-labels " <~~a>" value-fmt "")
- (push (make-instance 'reference :name name
- :lookup (slot-value slot 'reference))
- references))
+ (push (make-instance 'hyperlink :name name
+ :lookup (slot-value slot 'hyperlink))
+ hyperlinks))
(progn
(string-append fmtstr-html-ref html-str)
(string-append fmtstr-xml-ref xml-str)
@@ -115,7 +128,7 @@
(setq xmlvalue-func (append xmlvalue-func plain-value-func)))
)))
- (setf (slot-value cl 'references) references)
+ (setf (slot-value cl 'hyperlinks) hyperlinks)
(if value-func
(setq value-func `(lambda (x) (values ,@value-func)))
@@ -205,11 +218,15 @@
(obj-data-end-fmtstr :initarg :obj-data-end-fmtstr :reader obj-data-end-fmtstr)
(obj-data-value-func :initarg :obj-data-value-func :reader obj-data-value-func)
(link-ref :initarg :link-ref :reader link-ref))
- (:default-initargs :file-start-str nil :file-end-str nil :list-start-fmtstr nil :list-start-value-func nil
- :list-start-indent nil :list-end-fmtstr nil :list-end-value-func nil :list-end-indent nil
- :obj-start-fmtstr nil :obj-start-value-func nil :obj-start-indent nil
- :obj-end-fmtstr nil :obj-end-value-func nil :obj-end-indent nil
- :obj-data-indent nil :obj-data-fmtstr nil :obj-data-fmtstr-labels nil :obj-data-end-fmtstr nil
+ (:default-initargs :file-start-str nil :file-end-str nil
+ :list-start-fmtstr nil :list-start-value-func nil
+ :list-start-indent nil :list-end-fmtstr nil
+ :list-end-value-func nil :list-end-indent nil
+ :obj-start-fmtstr nil :obj-start-value-func nil
+ :obj-start-indent nil :obj-end-fmtstr nil
+ :obj-end-value-func nil :obj-end-indent nil
+ :obj-data-indent nil :obj-data-fmtstr nil
+ :obj-data-fmtstr-labels nil :obj-data-end-fmtstr nil
:obj-data-value-func nil :link-ref nil)
(:documentation "Parent for all dataformat objects"))
@@ -220,7 +237,7 @@
())
(defun text-list-start-value-func (obj nitems)
- (values (hyperobject-class-title obj) nitems))
+ (values (hyperobject-class-user-name obj) nitems))
(defclass textformat (dataformat)
()
@@ -238,7 +255,7 @@
(string-downcase (class-name (class-of obj))))
(defun htmlformat-list-start-value-func (x nitems)
- (values (hyperobject-class-title x) nitems (class-name-of x)))
+ (values (hyperobject-class-user-name x) nitems (class-name-of x)))
(defclass htmlformat (textformat)
()
@@ -287,7 +304,7 @@
(format nil "~alist" (class-name-of x)))
(defun xmlformat-list-start-value-func (x nitems)
- (values (format nil "~alist" (class-name-of x)) (hyperobject-class-title x) nitems))
+ (values (format nil "~alist" (class-name-of x)) (hyperobject-class-user-name x) nitems))
(defclass xmlformat (textformat)
()
@@ -320,7 +337,7 @@
:fmtstr-labels nil
:page-name "disp-func1"
:href-head nil :href-end nil :ampersand nil)
- (:documentation "Formatting for a linked reference"))
+ (:documentation "Formatting for a linked hyperlink"))
(defclass html-link-ref (link-ref)
()
@@ -472,28 +489,17 @@
(defgeneric fmt-obj-data-with-ref (obj fmt s label refvars))
(defmethod fmt-obj-data-with-ref (x (fmt textformat) s label refvars)
- (let ((refstr (make-ref-data-str x fmt label))
- (refvalues nil)
- (field-values
- (multiple-value-list
- (funcall (funcall (obj-data-value-func fmt) x) x))))
-
- ;; make list of reference link fields for printing to refstr template
- (dolist (ref (hyperobject-class-references x))
- (let ((link-start
- (make-link-start x (link-ref fmt) (name ref) (lookup ref)
- (nth (position (name ref)
- (hyperobject-class-fields x)
- :key #'(lambda (x)
- (slot-definition-name x)))
- field-values)
- (append (link-parameters ref) refvars)))
- (link-end (make-link-end x (link-ref fmt) (name ref))))
- (push link-start refvalues)
- (push link-end refvalues)))
+ (let ((refvalues '()))
+ ;; make list of hyperlink link fields for printing to refstr template
+ (dolist (name (hyperobject-class-print-slots x))
+ (let-when (hyperlink (find name (hyperobject-class-hyperlinks x) :key #'name))
+ (push (make-link-start x (link-ref fmt) name (lookup hyperlink)
+ (slot-value x name)
+ (append (link-parameters hyperlink) refvars))
+ refvalues)
+ (push (make-link-end x (link-ref fmt) name) refvalues)))
(setq refvalues (nreverse refvalues))
-
- (apply #'format s refstr refvalues)))
+ (apply #'format s (make-ref-data-str x fmt label) refvalues)))
(defgeneric obj-data (obj))
(defmethod obj-data (x)
@@ -505,7 +511,7 @@
(defgeneric make-ref-data-str (obj fmt &optional label))
(defmethod make-ref-data-str (x (fmt textformat) &optional (label nil))
- "Return fmt string for that contains ~a slots for reference link start and end"
+ "Return fmt string for that contains ~a slots for hyperlink link start and end"
(unless (link-ref fmt)
(error "fmt does not contain a link-ref"))
(let ((refstr
@@ -528,7 +534,7 @@
(dolist (obj objlist)
(awhen (hyperobject-class-subobjects obj) ;; access list of functions
(dolist (child-obj it) ;; for each child function
- (awhen (funcall (reader child-obj) obj)
+ (awhen (slot-value obj (name-slot child-obj))
(load-all-subobjects it))))))
objs))
@@ -554,10 +560,10 @@
(if subobjects
(awhen (hyperobject-class-subobjects obj) ;; access list of functions
(dolist (child-obj it) ;; for each child function
- (awhen (funcall (reader child-obj) obj) ;; access set of child objects
- (view-hyperobject it fmt strm label
- (1+ indent) english-only-function
- subobjects refvars)))))
+ (awhen (slot-value obj (name-slot child-obj)) ;; access set of child objects
+ (view-hyperobject it fmt strm label
+ (1+ indent) english-only-function
+ subobjects refvars)))))
(fmt-obj-end obj fmt strm indent)))
(fmt-list-end (car objs) fmt strm indent nobjs))
t))
@@ -576,3 +582,9 @@
(fmt-file-end fmt os)))
objs)
+
+;;; Misc formatting
+
+(defun fmt-comma-integer (i)
+ (format nil "~:d" i))
+