From aacd771e49387a91a86fb14bc96c4c13d9996085 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 8 Jul 2003 04:00:56 +0000 Subject: [PATCH] r5249: *** empty log message *** --- mop.lisp | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/mop.lisp b/mop.lisp index e868376..b339e80 100644 --- a/mop.lisp +++ b/mop.lisp @@ -11,7 +11,7 @@ ;;;; in Text, HTML, and XML formats. This includes hyperlinking ;;;; capability and sub-objects. ;;;; -;;;; $Id: mop.lisp,v 1.80 2003/06/25 19:28:31 kevin Exp $ +;;;; $Id: mop.lisp,v 1.81 2003/07/08 04:00:56 kevin Exp $ ;;;; ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg ;;;; ************************************************************************* @@ -224,10 +224,15 @@ (defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds) - #+ho-normal-cesd (declare (ignore name)) - (let* ((esd (call-next-method)) - (dsd (car dsds)) - (value-type (canonicalize-value-type (slot-value dsd 'value-type)))) + (declare (ignore cl #+ho-normal-cesd name)) + (let ((esd (call-next-method))) + (if (typep esd 'hyperobject-esd) + (compute-hyperobject-esd esd dsds) + esd))) + +(defun compute-hyperobject-esd (esd dsds) + (let ((dsd (car dsds)) + (value-type (canonicalize-value-type (slot-value dsd 'value-type)))) (multiple-value-bind (sql-type sql-length) (value-type-to-sql-type value-type) (setf (slot-value esd 'sql-type) sql-type) @@ -235,17 +240,17 @@ (setf (slot-value esd 'type) (value-type-to-lisp-type value-type)) (setf (slot-value esd 'value-type) value-type) (setf (slot-value esd 'user-name) - (aif (slot-value dsd 'user-name) - it - (string-downcase (symbol-name (slot-definition-name dsd))))) + (aif (slot-value dsd 'user-name) + it + (string-downcase (symbol-name (slot-definition-name dsd))))) (setf (slot-value esd 'sql-name) - (aif (slot-value dsd 'sql-name) - it - (lisp-name-to-sql-name (slot-definition-name dsd)))) + (aif (slot-value dsd 'sql-name) + it + (lisp-name-to-sql-name (slot-definition-name dsd)))) (setf (slot-value esd 'sql-name) - (aif (slot-value dsd 'sql-name) - it - (lisp-name-to-sql-name (slot-definition-name dsd)))) + (aif (slot-value dsd 'sql-name) + it + (lisp-name-to-sql-name (slot-definition-name dsd)))) (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters description value-constraint indexed null-allowed unique short-description void-text read-only-groups -- 2.34.1