X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=classes.lisp;h=ce08ece3ac09671aebc21c4f17686e955b3d129a;hp=587efce21883c37d561c6d36a4edf7bc1825f7cb;hb=HEAD;hpb=8dc001f5e7cf851c06006e489473a85611d348be

diff --git a/classes.lisp b/classes.lisp
index 587efce..ce08ece 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -38,7 +38,7 @@
    (suppress :value-type string :initarg :suppress :reader suppress))
   (:metaclass hyperobject-class)
   (:user-name "Rank")
-  (:default-print-slots rank sab tty suppres))
+  (:default-print-slots rank sab tty suppress))
 
 (defclass udef (umlsclass)
   ((def :value-type cdata :initarg :def :reader def)
@@ -141,10 +141,11 @@
    (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))
+   (srl :value-type fixnum :initarg :srl :reader srl)
+   (ts :value-type string :initarg :ts :reader ts))
   (:metaclass hyperobject-class)
   (:user-name "Source")
-  (:default-print-slots aui sab code saui sdui scui tty srl))
+  (:default-print-slots aui sab code saui sdui scui tty srl ts))
 
 (defclass uterm (umlsclass)
   ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
@@ -170,11 +171,11 @@
   (:default-print-slots tui sty))
 
 (defclass urel (umlsclass)
-  ((rel :value-type string :initarg :rel :reader rel :hyperlink find-brel-rel)
+  ((rel :value-type string :initarg :rel :reader rel)
    (cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)
    (aui1 :value-type fixnum :initarg :aui1 :reader aui1 :print-formatter fmt-aui)
    (stype1 :value-type string  :initarg :stype1 :reader stype1)
-   (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-sui
+   (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-cui
          :print-formatter fmt-cui)
    (aui2 :value-type fixnum :initarg :aui2 :reader aui2 :hyperlink find-ucon-aui
          :print-formatter fmt-aui)
@@ -193,6 +194,7 @@
   (:user-name "Relationship")
   (:default-print-slots stype1 rel cui2 aui2 stype2 rela rui srui sab sl rg dir suppress pfstr2))
 
+#+mrcoc
 (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)
@@ -226,7 +228,8 @@
    (s#term :reader s#term :subobject (find-uterm-cui cui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#rel :reader s#rel :subobject (find-urel-cui cui))
-   (s#coc :reader s#coc :subobject (find-ucoc-cui cui)))
+   #+mrcoc (s#coc :reader s#coc :subobject (find-ucoc-cui cui))
+   )
   (:metaclass hyperobject-class)
   (:user-name "Concept")
   (:default-print-slots cui lrl pfstr))
@@ -269,8 +272,9 @@
    (s#term :reader s#term :subobject (find-uterm-cui cui))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#rel :reader s#rel :subobject (find-urel-cui cui))
-   (s#coc :reader s#coc :subobject (find-ucoc-cui cui)))
-  (:documentation "CONSO is a new concept from the RRF files. This object is a rather raw row from the MRCONSO table.")
+   #+mrcoc (s#coc :reader s#coc :subobject (find-ucoc-cui cui))
+   )
+  (:documentation "CONSO is a new concept from the RRF files.")
   (:metaclass hyperobject-class)
   (:user-name "Concept")
   (:default-print-slots cui kcuilrl str sab))
@@ -555,4 +559,3 @@
   (:user-name "UMLS Statistic")
   (:default-print-slots name hits srl)
   (:documentation "Custom Table: UMLS Database statistics."))
-