X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=classes.lisp;h=cdc4d561648b62b234ad293f6ba58b6b446086f2;hb=67ee261d341603e293f6b0314d5cd12522fa04c6;hp=0a926b617f1fcc42c23c6889bda2249f17a9f97f;hpb=e70c7b119ecfffb895d5536d0edb1fd373633038;p=umlisp.git

diff --git a/classes.lisp b/classes.lisp
index 0a926b6..cdc4d56 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -32,7 +32,7 @@
   (:default-print-slots sab srl)
   (:description "Custom Table: Source Restriction Level"))
 
-  
+
 (defclass urank (umlsclass)
   ((rank :value-type fixnum :initarg :rank :reader rank)
    (sab :value-type string :initarg :sab :reader sab)
@@ -147,7 +147,7 @@
   (: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
         :hyperlink find-ucon-aui)
@@ -161,7 +161,7 @@
    (tty :value-type string :initarg :tty :reader tty :hyperlink find-btty-tty)
    (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)
+   (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)
@@ -214,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)
@@ -225,7 +225,7 @@
   (:metaclass hyperobject-class)
   (:user-name "Relationship")
   (:default-print-slots stype1 rel cui2 aui2 stype2 rela rui srui sab sl rg dir suppress pfstr2))
-	
+
 (defclass ucoc (umlsclass)
   ((cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)
    (aui1 :value-type fixnum :initarg :aui1 :reader aui1 :print-formatter fmt-aui)
@@ -250,6 +250,9 @@
    (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#hier :reader s#hier :subobject (find-uhier-cui cui))
+   (s#map :reader s#map :subobject (find-umap-cui cui))
+   (s#smap :reader s#smap :subobject (find-usmap-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))
@@ -260,15 +263,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)
@@ -350,6 +344,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