projects
/
hyperobject.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r4921: Auto commit for Debian build
[hyperobject.git]
/
mop.lisp
diff --git
a/mop.lisp
b/mop.lisp
index 3075517d85aae7a38ba8172cf7250f253f0f7638..b34541c11d7982647d1638cda566bd52fb438b38 100644
(file)
--- a/
mop.lisp
+++ b/
mop.lisp
@@
-11,7
+11,7
@@
;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
;;;; in Text, HTML, and XML formats. This includes hyperlinking
;;;; capability and sub-objects.
;;;;
-;;;; $Id: mop.lisp,v 1.6
5 2003/04/29 09:24:27
kevin Exp $
+;;;; $Id: mop.lisp,v 1.6
9 2003/05/06 22:19:09
kevin Exp $
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
;;;;
;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
;;;;
@@
-244,12
+244,17
@@
(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) #+ho-normal-cesd name dsds)
#+ho-normal-cesd (declare (ignore name))
(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)))
+ (let* ((esd (call-next-method))
+ (dsd (car dsds))
+ (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
(multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
(setf (slot-value esd 'sql-type) sql-type)
(setf (slot-value esd 'length) length)
(setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
(multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
(setf (slot-value esd 'sql-type) sql-type)
(setf (slot-value esd 'length) length)
(setf (slot-value esd 'type) (value-type-to-lisp-type value-type))
- (setf (slot-value esd 'value-type) (canonicalize-value-type (slot-value (car dsds) 'value-type)))
+ (setf (slot-value esd 'value-type) value-type)
+ (dolist (name '(print-formatter subobject hyperlink hyperlink-parameters description user-name
+ value-constraint index null-allowed))
+ (setf (slot-value esd name) (slot-value dsd name)))
esd)))
esd)))
@@
-260,6
+265,10
@@
#+ho-normal-esdc
(setq cl:*features* (delete :ho-normal-esdc cl:*features*))
#+ho-normal-esdc
(setq cl:*features* (delete :ho-normal-esdc cl:*features*))
+(defun lisp-type-is-a-string (type)
+ (or (eq type 'string)
+ (and (listp type) (some #'(lambda (x) (eq x 'string)) type))))
+
(defun value-type-to-lisp-type (value-type)
(case (if (atom value-type)
value-type
(defun value-type-to-lisp-type (value-type)
(case (if (atom value-type)
value-type