X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=classes.lisp;h=0ae8ad0d2a42a6770154c266d6f8eb2b747c2439;hb=baef3e3eba503d04fe6d19ac3087bf9d3dbc37b9;hp=7f88827e22e2f2d999ded65423eb53efa07c3bc1;hpb=4087c342d473dce4a4dfc7812704e9e5805a3669;p=umlisp.git

diff --git a/classes.lisp b/classes.lisp
index 7f88827..0ae8ad0 100644
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.21 2002/12/05 19:12:05 kevin Exp $
+;;;; $Id: classes.lisp,v 1.22 2002/12/09 14:11:09 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -30,7 +30,7 @@
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :srl nil)
-  (:title "Source Restriction Level")
+  (:user-name "Source Restriction Level")
   (:print-slots sab srl)
   (:description "Custom Table: Source Restriction Level"))
 
@@ -42,7 +42,7 @@
    (supres :type string :initarg :supres :reader supres))
   (:metaclass hyperobject-class)
   (:default-initargs :rank nil :sab nil :tty nil :supres nil)
-  (:title "Rank")
+  (:user-name "Rank")
   (:print-slots rank sab tty supres))
 
 (defclass udef (umlsclass)
@@ -50,7 +50,7 @@
    (sab :type string :initarg :sab :reader sab :hyperlink find-usab-rsab))
   (:metaclass hyperobject-class)
   (:default-initargs :def nil :sab nil)
-  (:title "Definition")
+  (:user-name "Definition")
   (:print-slots sab def))
 
 (defclass usat (umlsclass)
@@ -60,7 +60,7 @@
    (atv :type cdata :initarg :atv :reader atv))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :atn nil :atv nil)
-  (:title "Simple Attribute")
+  (:user-name "Simple Attribute")
   (:print-slots sab code atn atv))
 
 (defclass usab (umlsclass)
@@ -93,7 +93,7 @@
 		     :slc nil :scc nil :srl nil :tfr nil :cfr nil :cxty nil
 		     :ttyl nil :atnl nil :lat nil :cenc nil :curver nil
 		     :sabin nil)
-  (:title "Source Abbreviation")
+  (:user-name "Source Abbreviation")
   (:print-slots vcui rcui vsab rsab son sf sver mstart mend imeta
 		rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
 		curver sabin))
@@ -105,7 +105,7 @@
    (srl :type fixnum :initarg :srl :reader srl))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :tty nil :srl nil)
-  (:title "Source")
+  (:user-name "Source")
   (:print-slots sab code tty srl))
 
 (defclass ucxt (umlsclass)
@@ -123,7 +123,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
 		     :cui2 nil :hcd nil :rela nil :xc nil)
-  (:title "Context")
+  (:user-name "Context")
   (:print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs))
 
 (defclass ustr (umlsclass)
@@ -137,13 +137,13 @@
    (str :type cdata :initarg :str :reader str)
    (lrl :type fixnum :initarg :lrl :reader lrl)
    (stt :type string :initarg :stt :reader stt)
-   (s#sat :reader s#sat :subobject t)
-   (s#so :reader s#so :subobject t)
-   (s#cxt :reader s#cxt :subobject t))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui sui))
+   (s#so :reader s#so :subobject (find-uso-cuisui cui sui))
+   (s#cxt :reader s#cxt :subobject (find-ucxt-cuisui cui sui)))
   (:metaclass hyperobject-class)
   (:default-initargs 
    :sui nil :cui nil :lui nil :cuisui nil :str nil :lrl nil :stt nil)
-  (:title "String")
+  (:user-name "String")
   (:print-slots sui stt lrl str))
 
 (defclass ulo (umlsclass)
@@ -155,7 +155,7 @@
    (soui :type string :initarg :soui :reader soui))
   (:metaclass hyperobject-class)
   (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
-  (:title "Locator")
+  (:user-name "Locator")
   (:print-slots isn fr un sna soui sui))
 
 (defclass uterm (umlsclass)
@@ -166,11 +166,11 @@
    (lat :type string :initarg :lat :reader lat)
    (ts :type string  :initarg :ts :reader ts)
    (lrl :type fixnum :initarg :lrl :reader lrl)
-   (s#str :reader s#str :subobject t)
-   (s#sat :reader s#sat :subobject t))
+   (s#str :reader s#str :subobject (find-ustr-cuilui cui lui))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui lui)))
   (:metaclass hyperobject-class)
   (:default-initargs :lui nil :cui nil :lat nil :ts nil :lrl nil)
-  (:title "Term")
+  (:user-name "Term")
   (:print-slots lui lat ts lrl))
 
 (defclass usty (umlsclass)
@@ -179,7 +179,7 @@
    (sty :type string :initarg :sty :reader sty))
   (:metaclass hyperobject-class)
   (:default-initargs :tui nil :sty nil)
-  (:title "Semantic Type")
+  (:user-name "Semantic Type")
   (:print-slots tui sty))
 
 (defclass urel (umlsclass)
@@ -195,7 +195,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs 
    :rel nil :cui1 nil :cui2 nil :pfstr2 nil :rela nil :sab nil :sl nil :mg nil)
-  (:title "Relationship")
+  (:user-name "Relationship")
   (:print-slots rel rela sab sl mg cui2 pfstr2))
 	
 (defclass ucoc (umlsclass)
@@ -210,7 +210,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs 
    :cui1 nil :cui2 nil :pfstr2 nil :soc nil :cot nil :cof nil :coa nil)
-  (:title "Co-occuring Concept")
+  (:user-name "Co-occuring Concept")
   (:print-slots soc cot cof coa cui2 pfstr2))
 
 	
@@ -220,7 +220,7 @@
    (atx :type cdata :initarg :atx :reader atx))
   (:metaclass hyperobject-class)
   (:default-initargs :sab nil :rel nil :atx nil)
-  (:title "Associated Expression")
+  (:user-name "Associated Expression")
   (:print-slots sab rel atx))
 
 (defclass ucon (umlsclass)
@@ -228,17 +228,17 @@
 	:hyperlink find-ucon-cui)
    (pfstr :type cdata :initarg :pfstr :reader pfstr)
    (lrl :type fixnum :initarg :lrl :reader lrl)
-   (s#term :reader s#term :subobject t)
-   (s#def :reader s#def :subobject t)
-   (s#lo :reader s#lo :subobject t)
-   (s#rel :reader s#rel :subobject t)
-   (s#coc :reader s#coc :subobject t)
-   (s#sat :reader s#sat :subobject t)
-   (s#atx :reader s#atx :subobject t)
-   (s#sty :reader s#sty :subobject t))
+   (s#term :reader s#term :subobject (find-uterm-cui cui))
+   (s#def :reader s#def :subobject (find-udef-cui cui))
+   (s#lo :reader s#lo :subobject (find-ulo-cui cui))
+   (s#rel :reader s#rel :subobject (find-urel-cui cui))
+   (s#coc :reader s#coc :subobject (find-ucoc-cui cui))
+   (s#sat :reader s#sat :subobject (find-usat-ui cui))
+   (s#atx :reader s#atx :subobject (find-uatx-cui cui))
+   (s#sty :reader s#sty :subobject (find-usty-cui cui)))
   (:metaclass hyperobject-class)
   (:default-initargs :cui nil :pfstr nil :lrl nil)
-  (:title "Concept")
+  (:user-name "Concept")
   (:print-slots cui lrl pfstr))
 
 (defclass uxw (umlsclass)
@@ -248,7 +248,7 @@
    (sui :type fixnum :initform nil :initarg :sui :reader sui :print-formatter fmt-sui))
   (:metaclass hyperobject-class)
   (:default-initargs :wd nil :cui nil :lui nil :sui nil)
-  (:title "XW Index")
+  (:user-name "XW Index")
   (:print-slots wd cui lui sui))
 
 (defclass uxnw (umlsclass)
@@ -257,7 +257,7 @@
    (cuilist :type list :initarg :cuilist :reader uxnw-cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nwd nil :cuilist nil)
-  (:title "XNW Index")
+  (:user-name "XNW Index")
   (:print-slots lat nwd cuilist))
 
 (defclass uxns (umlsclass)
@@ -266,7 +266,7 @@
    (cuilist :type list :initarg :cuilist :reader cuilist))
   (:metaclass hyperobject-class)
   (:default-initargs :lat nil :nstr nil :cuilist nil)
-  (:title "XNS Index")
+  (:user-name "XNS Index")
   (:print-slots lat nstr cuilist))
 
 
@@ -276,19 +276,19 @@
   ((eui :type fixnum :initarg :eui :reader eui :print-formatter fmt-eui
 	:hyperlink find-lexterm-eui)
    (wrd :type string :initarg :wrd :reader wrd)
-   (s#abr :reader s#abr :subobject t)
-   (s#agr :reader s#agr :subobject t)
-   (s#cmp :reader s#cmp :subobject t)
-   (s#mod :reader s#mod :subobject t)
-   (s#nom :reader s#nom :subobject t)
-   (s#prn :reader s#prn :subobject t)
-   (s#prp :reader s#prp :subobject t)
-   (s#spl :reader s#spl :subobject t)
-   (s#trm :reader s#trm :subobject t)
-   (s#typ :reader s#typ :subobject t))
+   (s#abr :reader s#abr :subobject (find-labr-eui eui))
+   (s#agr :reader s#agr :subobject (find-lagr-eui eui))
+   (s#cmp :reader s#cmp :subobject (find-lcmp-eui eui))
+   (s#mod :reader s#mod :subobject (find-lmod-eui eui))
+   (s#nom :reader s#nom :subobject (find-lnom-eui eui))
+   (s#prn :reader s#prn :subobject (find-lprn-eui eui))
+   (s#prp :reader s#prp :subobject (find-lprp-eui eui))
+   (s#spl :reader s#spl :subobject (find-lspl-eui eui))
+   (s#trm :reader s#trm :subobject (find-ltrm-eui eui))
+   (s#typ :reader s#typ :subobject (find-ltyp-eui eui)))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :wrd nil)
-  (:title "Lexical Term")
+  (:user-name "Lexical Term")
   (:print-slots eui wrd))
 
 
@@ -300,7 +300,7 @@
    (bas2 :type string :initarg :bas2 :reader bas2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
-  (:title "Abbreviations and Acronyms")
+  (:user-name "Abbreviations and Acronyms")
   (:print-slots eui bas abr eui2 bas2))
 
 (defclass lagr  (umlsclass)
@@ -312,7 +312,7 @@
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :str nil :sca nil :agr nil :cit nil :bas nil)
-  (:title "Agreement and Inflection")
+  (:user-name "Agreement and Inflection")
   (:print-slots eui str sca agr cit bas))
 
 (defclass lcmp  (umlsclass)
@@ -322,7 +322,7 @@
    (com :type string :initarg :com :reader com))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :com nil)
-  (:title "Complementation")
+  (:user-name "Complementation")
   (:print-slots eui bas sca com))
 
 (defclass lmod  (umlsclass)
@@ -333,7 +333,7 @@
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
-  (:title "Modifiers")
+  (:user-name "Modifiers")
   (:print-slots eui bas sca psnmod fea))
 
 (defclass lnom  (umlsclass)
@@ -345,7 +345,7 @@
    (sca2 :type string :initarg :sca2 :reader sca2))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
-  (:title "Nominalizations")
+  (:user-name "Nominalizations")
   (:print-slots eui bas sca eui2 bas2 sca2))
 
 (defclass lprn  (umlsclass)
@@ -360,7 +360,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :num nil :gnd nil :cas nil
 		     :pos nil :qnt nil :fea nil)
-  (:title "Pronouns")
+  (:user-name "Pronouns")
   (:print-slots eui bas num gnd cas pos qnt fea))
 
 (defclass lprp  (umlsclass)
@@ -371,7 +371,7 @@
    (fea :type string :initarg :fea :reader fea))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :str nil :sca nil :fea nil)
-  (:title "Properties")
+  (:user-name "Properties")
   (:print-slots eui bas str sca fea))
 
 
@@ -381,7 +381,7 @@
    (bas :type string :initarg :bas :reader bas))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :spv nil :bas nil)
-  (:title "Spelling Variants")
+  (:user-name "Spelling Variants")
   (:print-slots eui spv bas))
 
 
@@ -391,7 +391,7 @@
    (gen :type string :initarg :gen :reader gen))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :gen nil)
-  (:title "Trade Marks")
+  (:user-name "Trade Marks")
   (:print-slots eui bas gen))
 
 (defclass ltyp  (umlsclass)
@@ -401,7 +401,7 @@
    (typ :type string :initarg :typ :reader typ))
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :typ nil)
-  (:title "Inflection Type")
+  (:user-name "Inflection Type")
   (:print-slots eui bas sca typ))
 
 (defclass lwd (umlsclass)
@@ -409,7 +409,7 @@
    (euilist :type list :initarg :euilist :reader euilist))
   (:metaclass hyperobject-class)
   (:default-initargs :wrd nil :euilist nil)
-  (:title "Lexical Word Index")
+  (:user-name "Lexical Word Index")
   (:print-slots wrd euilist))
 
 ;;; Semantic NET objects
@@ -429,7 +429,7 @@
   (:default-initargs 
    :rt nil :ui nil :styrl nil :stnrtn nil :def nil :ex nil :un nil :rh nil 
    :abr nil :rin nil)
-  (:title "Basic information about Semantic Types and Relations")
+  (:user-name "Basic information about Semantic Types and Relations")
   (:print-slots rt ui styrl stnrtn def ex un rh abr rin))
 
 (defclass sstr (umlsclass)
@@ -439,7 +439,7 @@
    (ls :type string :initarg :ls :reader ls))
   (:metaclass hyperobject-class)
   (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
-  (:title "Structure of the Network")
+  (:user-name "Structure of the Network")
   (:print-slots styrl rl styrl2 ls))
 
 (defclass sstre1 (umlsclass)
@@ -448,7 +448,7 @@
    (ui3 :type integer :initarg :ui3 :reader ui3 :print-formatter fmt-tui))
   (:metaclass hyperobject-class)
   (:default-initargs :ui nil :ui2 nil :ui3 nil)
-  (:title "Fully Inherited Set of Releatons (TUI's)")
+  (:user-name "Fully Inherited Set of Releatons (TUI's)")
   (:print-slots ui ui2 ui3))
 
 (defclass sstre2 (umlsclass)
@@ -457,7 +457,7 @@
    (sty2 :type string :initarg :ui3 :reader sty2))
   (:metaclass hyperobject-class)
   (:default-initargs :sty nil :rl nil :sty2 nil)
-  (:title "Fully Inherited Set of Releatons (strings)")
+  (:user-name "Fully Inherited Set of Releatons (strings)")
   (:print-slots sty rl sty2))
 
 ;;; Formatting routines