r5249: *** empty log message ***

diff --git a/mop.lisp b/mop.lisp
index e868376fbcb3c366a39a284477ae9b2f1da783da..b339e802a53d3364af2bea92c1998b4ed437261b 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking\r
 ;;;; capability and sub-objects.\r
 ;;;;\r
-;;;; $Id: mop.lisp,v 1.80 2003/06/25 19:28:31 kevin Exp $\r
+;;;; $Id: mop.lisp,v 1.81 2003/07/08 04:00:56 kevin Exp $\r
 ;;;;\r
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg\r
 ;;;; *************************************************************************\r
@@ -224,10 +224,15 @@
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)\r
                                                      #+ho-normal-cesd name\r
                                                      dsds)\r
-  #+ho-normal-cesd (declare (ignore name))\r
-  (let* ((esd (call-next-method))\r
-        (dsd (car dsds))\r
-        (value-type (canonicalize-value-type (slot-value dsd 'value-type))))\r
+  (declare (ignore cl #+ho-normal-cesd name))\r
+  (let ((esd (call-next-method)))\r
+    (if (typep esd 'hyperobject-esd)\r
+       (compute-hyperobject-esd esd dsds)\r
+       esd)))\r
+\r
+(defun compute-hyperobject-esd (esd dsds)\r
+  (let ((dsd (car dsds))\r
+       (value-type (canonicalize-value-type (slot-value dsd 'value-type))))\r
     (multiple-value-bind (sql-type sql-length) \r
        (value-type-to-sql-type value-type)\r
       (setf (slot-value esd 'sql-type) sql-type)\r
@@ -235,17 +240,17 @@
     (setf (slot-value esd 'type) (value-type-to-lisp-type value-type))\r
     (setf (slot-value esd 'value-type) value-type)\r
     (setf (slot-value esd 'user-name)\r
-      (aif (slot-value dsd 'user-name)\r
-          it\r
-          (string-downcase (symbol-name (slot-definition-name dsd)))))\r
+         (aif (slot-value dsd 'user-name)\r
+              it\r
+              (string-downcase (symbol-name (slot-definition-name dsd)))))\r
     (setf (slot-value esd 'sql-name)\r
-      (aif (slot-value dsd 'sql-name)\r
-          it\r
-          (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+         (aif (slot-value dsd 'sql-name)\r
+              it\r
+              (lisp-name-to-sql-name (slot-definition-name dsd))))\r
     (setf (slot-value esd 'sql-name)\r
-      (aif (slot-value dsd 'sql-name)\r
-          it\r
-          (lisp-name-to-sql-name (slot-definition-name dsd))))\r
+         (aif (slot-value dsd 'sql-name)\r
+              it\r
+              (lisp-name-to-sql-name (slot-definition-name dsd))))\r
     (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters\r
                    description value-constraint indexed null-allowed\r
                    unique short-description void-text read-only-groups\r