r11146: add source finding, add limit and filters to query

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 3d8c2ea181f390d1cce47385f329c5af63fbab48..0a926b617f1fcc42c23c6889bda2249f17a9f97f 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -147,8 +147,10 @@
   (:user-name "String")
   (:default-print-slots sui stt lrl str suppress))
 
+       
 (defclass uso (umlsclass)
-  ((aui :value-type fixnum :initarg :aui :reader aui :print-formatter fmt-aui)
+  ((aui :value-type fixnum :initarg :aui :reader aui :print-formatter fmt-aui
+        :hyperlink find-ucon-aui)
    (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
@@ -157,8 +159,10 @@
    (sdui :value-type string :initarg :sdui :reader sdui)
    (scui :value-type string :initarg :scui :reader scui)
    (tty :value-type string :initarg :tty :reader tty :hyperlink find-btty-tty)
-   (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (code :value-type string :initarg :code :reader code)
+   (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
+   (lat :value-type string :initarg lat :reader lat)
+   (str :value-type cdata :initarg :str :reader str)
    (srl :value-type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:user-name "Source")
@@ -239,13 +243,13 @@
   (:user-name "Co-occuring Concept")
   (:default-print-slots cot cof coa cui2 aui2 sab pfstr2))
 
-       
 (defclass ucon (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (pfstr :value-type cdata :initarg :pfstr :reader pfstr)
    (s#def :reader s#def :subobject (find-udef-cui cui))
+   (s#so :reader s#so :subobject (find-uso-cui cui))
    (s#sty :reader s#sty :subobject (find-usty-cui cui))
    (s#lo :reader s#lo :subobject (find-ulo-cui cui))
    (s#term :reader s#term :subobject (find-uterm-cui cui))