r11624: improve find-uconso-code

[umlisp.git] / classes.lisp

diff --git a/classes.lisp b/classes.lisp
index efa685feab503a063bbe5e03b58d5eb8964cd77b..76ba8d7bfbe194046e749528e28a20664689aa85 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -92,25 +92,6 @@
                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin ssn scit))
 
                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin ssn scit))
 

-(defclass ucxt (umlsclass)
-  ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
-   (code :value-type string :initarg :code :reader code)
-   (cxn :value-type fixnum :initarg :cxn :reader cxn)
-   (cxl :value-type string :initarg :cxl :reader cxl)
-   (rank :value-type string :initarg :rank :reader rank)
-   (cxs :value-type cdata :initarg :cxs :reader cxs)
-   (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)
-   (hcd :value-type string :initarg :hcd :reader hcd)
-   (rela :value-type string :initarg :rela :reader rela)
-   (xc :value-type string  :initarg :xc :reader xc)
-   (cvf :value-type string  :initarg :cvf :reader cvf))
-  (:metaclass hyperobject-class)
-  (:user-name "Context")
-  (:default-print-slots sab code cxn cxl hcd rela xc cui2 cxs))
-

 (defclass uhier (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :hyperlink find-ucon-cui
        :print-formatter fmt-cui)
 (defclass uhier (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :hyperlink find-ucon-cui
        :print-formatter fmt-cui)


@@ -141,8 +122,7 @@
    (stt :value-type string :initarg :stt :reader stt)
    (suppress :value-type string :initarg :suppress :reader suppress)
    (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
    (stt :value-type string :initarg :stt :reader stt)
    (suppress :value-type string :initarg :suppress :reader suppress)
    (s#so :reader s#so :subobject (find-uso-cuisui cui sui))

-   (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
-   (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui :sui sui)))

   (:metaclass hyperobject-class)
   (:user-name "String")
   (:default-print-slots sui stt lrl str suppress))
   (:metaclass hyperobject-class)
   (:user-name "String")
   (:default-print-slots sui stt lrl str suppress))


@@ -158,7 +138,7 @@
    (saui :value-type string :initarg :saui :reader saui)
    (sdui :value-type string :initarg :sdui :reader sdui)
    (scui :value-type string :initarg :scui :reader scui)
    (saui :value-type string :initarg :saui :reader saui)
    (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)
+   (tty :value-type string :initarg :tty :reader 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)
    (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)


@@ -168,17 +148,6 @@
   (:user-name "Source")
   (:default-print-slots aui sab code saui sdui scui tty srl))
 
   (:user-name "Source")
   (:default-print-slots aui sab code saui sdui scui tty srl))
 

-(defclass ulo (umlsclass)
-  ((isn :value-type string :initarg :isn :reader isn)
-   (fr :value-type fixnum :initarg :fr :reader fr)
-   (un :value-type string :initarg :un :reader un)
-   (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui)
-   (sna :value-type string :initarg :sna :reader sna)
-   (soui :value-type string :initarg :soui :reader soui))
-  (:metaclass hyperobject-class)
-  (:user-name "Locator")
-  (:default-print-slots isn fr un sna soui sui))
-

 (defclass uterm (umlsclass)
   ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
        :hyperlink find-uterm-lui)
 (defclass uterm (umlsclass)
   ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui
        :hyperlink find-uterm-lui)


@@ -188,7 +157,7 @@
    (ts :value-type string  :initarg :ts :reader ts)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))
    (ts :value-type string  :initarg :ts :reader ts)
    (lrl :value-type fixnum :initarg :lrl :reader lrl)
    (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))

-   (s#sat :reader s#sat :subobject (find-usat-ui cui lui)))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui :lui lui)))

   (:metaclass hyperobject-class)
   (:user-name "Term")
   (:default-print-slots lui lat ts lrl))
   (:metaclass hyperobject-class)
   (:user-name "Term")
   (:default-print-slots lui lat ts lrl))


@@ -247,16 +216,15 @@
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (lrl :value-type fixnum :initarg :lrl :reader lrl
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
    (lrl :value-type fixnum :initarg :lrl :reader lrl

-        :subobject (find-lrl-cui cui))
+        :compute-cached-value (find-lrl-cui cui))

    (pfstr :value-type cdata :initarg :pfstr :reader pfstr
    (pfstr :value-type cdata :initarg :pfstr :reader pfstr

-          :subobject (find-pfstr-cui cui))
+          :compute-cached-value (find-pfstr-cui cui))

    (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#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))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#rel :reader s#rel :subobject (find-urel-cui cui))
    (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))


@@ -269,6 +237,8 @@
 (defclass uconso (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)
 (defclass uconso (umlsclass)
   ((cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui
        :hyperlink find-ucon-cui)

+   (pfstr :value-type cdata :initarg :pfstr :reader pfstr
+          :compute-cached-value (find-pfstr-cui cui))

    (lat :value-type string :initarg :lat :reader lat)
    (ts :value-type string :initarg :ts :reader ts)
    (lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui)
    (lat :value-type string :initarg :lat :reader lat)
    (ts :value-type string :initarg :ts :reader ts)
    (lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui)


@@ -298,7 +268,6 @@
    (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#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))
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#rel :reader s#rel :subobject (find-urel-cui cui))
    (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))


@@ -306,7 +275,7 @@
   (:documentation "CONSO is a new concept from the RRF files. This object is a rather raw row from the MRCONSO table.")
   (:metaclass hyperobject-class)
   (:user-name "Concept")
   (:documentation "CONSO is a new concept from the RRF files. This object is a rather raw row from the MRCONSO table.")
   (:metaclass hyperobject-class)
   (:user-name "Concept")

-  (:default-print-slots cui lrl str sab))
+  (:default-print-slots cui kcuilrl str sab))

 
 (defclass umap (umlsclass)
   ((mapsetcui :value-type fixnum :initarg :mapsetcui :reader mapsetcui)
 
 (defclass umap (umlsclass)
   ((mapsetcui :value-type fixnum :initarg :mapsetcui :reader mapsetcui)