r3461: *** empty log message ***

[hyperobject.git] / hyperobject.lisp

diff --git a/hyperobject.lisp b/hyperobject.lisp
index cedfa5e82452c1292e9c6daf9d07b2aace52db37..a6d1b4944119a80484e7e5da90eb92f0d9b90695 100644 (file)
--- a/hyperobject.lisp
+++ b/hyperobject.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: hyperobject.lisp,v 1.9 2002/11/22 19:48:49 kevin Exp $
+;;;; $Id: hyperobject.lisp,v 1.10 2002/11/23 18:41:45 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -55,14 +55,14 @@
 
 (defclass hyperobject-dsd (standard-direct-slot-definition)
   ((ho-type :initarg :ho-type :initform nil :accessor dsd-ho-type)
-   (format-func :initarg :format-func :initform nil :accessor dsd-format-func)
+   (print-formatter :initarg :print-formatter :initform nil :accessor dsd-print-formatter)
    (subobject :initarg :subobject :initform nil :accessor dsd-subobject)
    (reference :initarg :reference :initform nil :accessor dsd-reference)
    ))
 
 (defclass hyperobject-esd (standard-effective-slot-definition)
   ((ho-type :initarg :ho-type :initform nil :accessor esd-ho-type)
-   (format-func :initarg :format-func :initform nil :accessor esd-format-func)
+   (print-formatter :initarg :print-formatter :initform nil :accessor esd-print-formatter)
    (subobject :initarg :subobject :initform nil :accessor esd-subobject)
    (reference :initarg :reference :initform nil :accessor esd-reference)
   ))
@@ -162,7 +162,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
       (apply
        #'make-instance 'hyperobject-esd 
        :ho-type ho-type
-       :format-func (slot-value dsd 'format-func)
+       :print-formatter (slot-value dsd 'print-formatter)
        :subobject (slot-value dsd 'subobject)
        :reference (slot-value dsd 'reference)
        ia)))
@@ -226,7 +226,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
                (namestr (symbol-name (slot-definition-name slot)))
                (namestr-lower (string-downcase (symbol-name (slot-definition-name slot))))
                  (type (slot-value slot 'ho-type))
-                 (formatter (slot-value slot 'format-func))
+                 (print-formatter (slot-value slot 'print-formatter))
                  (value-fmt "~a")
                  (plain-value-func nil)
                  html-str xml-str html-label-str xml-label-str)
@@ -280,9 +280,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
                (string-append fmtstr-html-ref-labels html-label-str)
                (string-append fmtstr-xml-ref-labels xml-label-str)))
          
-         (if formatter
+         (if print-formatter
              (setq plain-value-func 
-                   (list `(,formatter (,(intern namestr package) x))))
+                   (list `(,print-formatter (,(intern namestr package) x))))
              (setq plain-value-func 
                    (list `(,(intern namestr package) x))))
          (setq value-func (append value-func plain-value-func))