From d0a199def3bf3f5fb569db92089e7acdb421df8a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 21 Mar 2010 21:00:08 -0600 Subject: [PATCH] Add back u#so class --- classes.lisp | 21 +++++++++++++++++++++ sql-classes.lisp | 8 ++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/classes.lisp b/classes.lisp index db6def5..4df25ab 100644 --- a/classes.lisp +++ b/classes.lisp @@ -126,6 +126,27 @@ (: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) + (cui :value-type fixnum :initarg :cui :reader cui :print-formatter fmt-cui + :hyperlink find-ucon-cui) + (sui :value-type fixnum :initarg :sui :reader sui :print-formatter fmt-sui + :hyperlink find-ucon-sui) + (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) + (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) + (str :value-type cdata :initarg :str :reader str) + (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 ts)) + (defclass uterm (umlsclass) ((lui :value-type fixnum :initarg :lui :reader lui :print-formatter fmt-lui :hyperlink find-uterm-lui) diff --git a/sql-classes.lisp b/sql-classes.lisp index 8031ace..912a3fc 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -626,20 +626,20 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-uso-cui (cui &key (srl *current-srl*) (english-only nil) limit) (ensure-cui-integer cui) - (collect-umlisp-query (mrconso (aui sab code srl tty saui sdui scui lat str sui) + (collect-umlisp-query (mrconso (aui sab code srl tty saui sdui scui lat str sui ts) srl cui cui :lrl srl :limit limit :filter (when english-only "LAT='ENG'")) (make-instance 'uso :aui aui :sab sab :code code :srl srl :tty tty :cui cui :sui sui :saui saui :sdui sdui :scui scui - :lat lat :str str))) + :lat lat :str str :ts ts))) (defun find-uso-aui (aui &key (srl *current-srl*)) (ensure-sui-integer aui) (collect-umlisp-query (mrconso (sab cui sui code srl tty saui sdui scui lat - str) srl aui aui :lrl srl :single t) + str ts) srl aui aui :lrl srl :single t) (make-instance 'uso :aui aui :cui cui :sab sab :code code :srl srl :tty tty :sui sui :saui saui :sdui sdui :scui scui :lat lat - :str str))) + :str str :ts ts))) (defun find-uhier-cui (cui &key (srl *current-srl*)) (ensure-cui-integer cui) -- 2.34.1