X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=mop.lisp;h=48f7cc92902e007f7f3bbc669720d7c7eff1fa63;hb=6b46bb865b83dc69fe9a68240fd8b072861b8973;hp=e868376fbcb3c366a39a284477ae9b2f1da783da;hpb=a5951c260acbdcd4d38b672359b36f134fc656d9;p=hyperobject.git

diff --git a/mop.lisp b/mop.lisp
index e868376..48f7cc9 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.82 2003/07/08 07:12:57 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2003 by Kevin M. Rosenberg
 ;;;; *************************************************************************
@@ -224,28 +224,33 @@
 (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))
+  (declare (ignore #+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)
-      (setf (slot-value esd 'sql-length) sql-length))
+      (setf (esd-sql-type esd) sql-type)
+      (setf (esd-sql-length esd) sql-length))
     (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)))))
-    (setf (slot-value esd 'sql-name)
-      (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))))
+    (setf (esd-value-type esd) value-type)
+    (setf (esd-user-name esd)
+	  (aif (dsd-user-name dsd)
+	       it
+	       (string-downcase (symbol-name (slot-definition-name dsd)))))
+    (setf (esd-sql-name esd)
+	  (aif (dsd-sql-name dsd)
+	       it
+	       (lisp-name-to-sql-name (slot-definition-name dsd))))
+    (setf (esd-sql-name esd)
+	  (aif (dsd-sql-name dsd)
+	       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