r11156: fix trans extension for sbcl, fix index for mrrel

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index 3d8c2ea181f390d1cce47385f329c5af63fbab48..cee2fcd3b8db1569c77bf39a97d5713f336a58c8 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")
@@ -210,7 +214,7 @@
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
    (stype2 :value-type string  :initarg :stype2 :reader stype2)
    (rela :value-type string :initarg :rela :reader rela)
-   (rui :value-type string  :initarg :rui :reader rui)
+   (rui :value-type fixnum  :initarg :rui :reader rui :print-formatter fmt-rui)
    (srui :value-type string  :initarg :srui :reader srui)
    (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (sl :value-type string  :initarg :sl :reader sl)
@@ -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))
@@ -256,15 +260,6 @@
   (:user-name "Concept")
   (:default-print-slots cui lrl pfstr))
 
-(defclass udoc (umlsclass)
-  ((key :value-type string :initarg :key :reader key)
-   (value :value-type cdata :initarg :value :reader value)
-   (type :value-type cdata :initarg :type :reader etype)
-   (expl :value-type cdata :initarg :expl :reader expl))
-  (:metaclass hyperobject-class)
-  (:user-name "Abbreviation Documentation")
-  (:default-print-slots key value type expl))
-
 (defclass umap (umlsclass)
   ((mapsetcui :value-type fixnum :initarg :mapsetcui :reader mapsetcui)
    (mapsetsab :value-type string :initarg :mapsetsab :reader mapsetsab)
@@ -346,6 +341,15 @@
   (:user-name "XNS Index" "XNS Indices")
   (:default-print-slots lat nstr cuilist))
 
+(defclass udoc (umlsclass)
+  ((dockey :value-type string :initarg :dockey :reader dockey)
+   (expl :value-type cdata :initarg :expl :reader expl)
+   (dtype :value-type cdata :initarg :dtype :reader dtype)
+   (dvalue :value-type cdata :initarg :dvalue :reader dvalue))
+  (:metaclass hyperobject-class)
+  (:user-name "Documentation record")
+  (:default-print-slots dockey expl dtype dvalue))
+
 
 ;;; LEX objects