Update to UMLS 2014AB. Main change is removal of MRCOC.

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index ba0f51c06ac9f4267bc97d25fc616d1ddb51fcbb..1c656299575a35e334ae89ac3b442bd96de44f8f 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,10 +7,8 @@
 ;;;; Author:   Kevin M. Rosenberg
 ;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id$
-;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2006 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2010 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -143,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
@@ -172,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)
@@ -195,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)
@@ -228,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))
@@ -271,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))
@@ -557,4 +559,3 @@
   (:user-name "UMLS Statistic")
   (:default-print-slots name hits srl)
   (:documentation "Custom Table: UMLS Database statistics."))
-