r11624: improve find-uconso-code

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index d965e92baa8febf1120eca4306e2982e405e2d3c..76ba8d7bfbe194046e749528e28a20664689aa85 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -122,7 +122,7 @@
    (stt :value-type string :initarg :stt :reader stt)
    (suppress :value-type string :initarg :suppress :reader suppress)
    (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
-   (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui :sui sui)))
   (:metaclass hyperobject-class)
   (:user-name "String")
   (:default-print-slots sui stt lrl str suppress))
@@ -157,7 +157,7 @@
    (ts :value-type string  :initarg :ts :reader ts)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))
-   (s#sat :reader s#sat :subobject (find-usat-ui cui lui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui)))
   (:metaclass hyperobject-class)
   (:user-name "Term")
   (:default-print-slots lui lat ts lrl))
@@ -237,6 +237,8 @@
 (defclass uconso (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
+   (pfstr :value-type cdata :initarg :pfstr :reader pfstr
+          :compute-cached-value (find-pfstr-cui cui))
    (lat :value-type string :initarg :lat :reader lat)
    (ts :value-type string :initarg :ts :reader ts)
    (lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui)