r9534:

diff --git a/classes.lisp b/classes.lisp
index 72b4d450f4786b56cbe5c0fb90efbbd3028c4b0c..d51fc4ba16dab8137483504d32c65776436b6791 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -92,7 +92,6 @@
 (defclass ucxt (umlsclass)
   ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (code :value-type string :initarg :code :reader code)
 (defclass ucxt (umlsclass)
   ((sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (code :value-type string :initarg :code :reader code)

-   (rnk :value-type fixnum :initarg :rnk :reader rnk)

    (cxn :value-type fixnum :initarg :cxn :reader cxn)
    (cxl :value-type string :initarg :cxl :reader cxl)
    (cxs :value-type cdata :initarg :cxs :reader cxs)
    (cxn :value-type fixnum :initarg :cxn :reader cxn)
    (cxl :value-type string :initarg :cxl :reader cxl)
    (cxs :value-type cdata :initarg :cxs :reader cxs)


@@ -182,8 +181,7 @@
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
    (rela :value-type string :initarg :rela :reader rela)
    (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
    (rela :value-type string :initarg :rela :reader rela)
    (sab :value-type string :initarg :sab :reader sab :hyperlink find-usab-rsab)

-   (sl :value-type string  :initarg :sl :reader sl)
-   (mg :value-type string  :initarg :mg :reader mg))
+   (sl :value-type string  :initarg :sl :reader sl))

   (:metaclass hyperobject-class)
   (:user-name "Relationship")
   (:default-print-slots rel rela sab sl mg cui2 pfstr2))
   (:metaclass hyperobject-class)
   (:user-name "Relationship")
   (:default-print-slots rel rela sab sl mg cui2 pfstr2))


@@ -193,7 +191,6 @@
    (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :print-formatter fmt-cui
         :hyperlink find-ucon-cui)
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)
    (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :print-formatter fmt-cui
         :hyperlink find-ucon-cui)
    (pfstr2 :value-type cdata :initarg :pfstr2 :reader pfstr2)

-   (soc :value-type string :initarg :soc :reader soc)

    (cot :value-type string :initarg :cot :reader cot)
    (cof :value-type fixnum :initarg :cof :reader cof)
    (coa :value-type cdata :initarg :coa :reader coa))
    (cot :value-type string :initarg :cot :reader cot)
    (cof :value-type fixnum :initarg :cof :reader cof)
    (coa :value-type cdata :initarg :coa :reader coa))

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 525aa9cb8f32bfc05d1ecdd8bdbd0c102adba9e4..165e5317533c697fa3dc2575997b99d1e79901b7 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -301,11 +301,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-urel-cui (cui &key (srl *current-srl*))
   "Return a list of urel for cui"
   (ensure-cui-integer cui)
 (defun find-urel-cui (cui &key (srl *current-srl*))
   "Return a list of urel for cui"
   (ensure-cui-integer cui)

-  (collect-umlisp-query (mrrel (rel cui2 rela sab sl mg kpfstr2) srl cui1
+  (collect-umlisp-query (mrrel (rel cui2 rela sab sl kpfstr2) srl cui1

                            cui :lrl "KSRL")
     (make-instance 'urel :cui1 cui :rel rel
                   :cui2 (ensure-integer cui2) :rela rela :sab sab :sl sl
                            cui :lrl "KSRL")
     (make-instance 'urel :cui1 cui :rel rel
                   :cui2 (ensure-integer cui2) :rela rela :sab sab :sl sl

-                  :mg mg :pfstr2 kpfstr2)))
+                  :pfstr2 kpfstr2)))

 
 (defun find-cui2-urel-cui (cui &key (srl *current-srl*))
   "Return a list of urel for cui"
 
 (defun find-cui2-urel-cui (cui &key (srl *current-srl*))
   "Return a list of urel for cui"


@@ -317,11 +317,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-urel-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of urel for cui2"
   (ensure-cui-integer cui2)
 (defun find-urel-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of urel for cui2"
   (ensure-cui-integer cui2)

-  (collect-umlisp-query (mrrel (rel cui1 rela sab sl mg kpfstr2) srl cui2
+  (collect-umlisp-query (mrrel (rel cui1 rela sab sl kpfstr2) srl cui2

                            cui2 :lrl "KSRL")
     (make-instance 'urel :cui2 cui2 :rel rel
                   :cui1 (ensure-integer cui1) :rela rela :sab sab :sl sl
                            cui2 :lrl "KSRL")
     (make-instance 'urel :cui2 cui2 :rel rel
                   :cui1 (ensure-integer cui1) :rela rela :sab sab :sl sl

-                  :mg mg :pfstr2 kpfstr2)))
+                  :pfstr2 kpfstr2)))

 
 (defun find-ucon-rel-cui2 (cui2 &key (srl *current-srl*))
   (ensure-cui-integer cui2)
 
 (defun find-ucon-rel-cui2 (cui2 &key (srl *current-srl*))
   (ensure-cui-integer cui2)


@@ -332,22 +332,22 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-ucoc-cui (cui &key (srl *current-srl*))
   "Return a list of ucoc for cui"
   (ensure-cui-integer cui)
 (defun find-ucoc-cui (cui &key (srl *current-srl*))
   "Return a list of ucoc for cui"
   (ensure-cui-integer cui)

-  (collect-umlisp-query (mrcoc (cui2 soc cot cof coa kpfstr2) srl cui1
+  (collect-umlisp-query (mrcoc (cui2 cot cof coa kpfstr2) srl cui1

                            cui :lrl klrl :order (cof asc))
     (setq cui2 (ensure-integer cui2))
     (when (eql 0 cui2) (setq cui2 nil))
     (make-instance 'ucoc :cui1 cui :cui2 (ensure-integer cui2)
                            cui :lrl klrl :order (cof asc))
     (setq cui2 (ensure-integer cui2))
     (when (eql 0 cui2) (setq cui2 nil))
     (make-instance 'ucoc :cui1 cui :cui2 (ensure-integer cui2)

-                  :soc soc :cot cot :cof (ensure-integer cof) :coa coa
+                  :cot cot :cof (ensure-integer cof) :coa coa

                   :pfstr2 kpfstr2)))
 
 (defun find-ucoc-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of ucoc for cui2"
   (ensure-cui-integer cui2)
                   :pfstr2 kpfstr2)))
 
 (defun find-ucoc-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of ucoc for cui2"
   (ensure-cui-integer cui2)

-  (collect-umlisp-query (mrcoc (cui1 soc cot cof coa kpfstr2) srl cui2
+  (collect-umlisp-query (mrcoc (cui1 cot cof coa kpfstr2) srl cui2

                            cui2 :lrl klrl :order (cof asc))
     (when (zerop cui2) (setq cui2 nil))
     (make-instance 'ucoc :cui1 (ensure-integer cui1) :cui2 cui2
                            cui2 :lrl klrl :order (cof asc))
     (when (zerop cui2) (setq cui2 nil))
     (make-instance 'ucoc :cui1 (ensure-integer cui1) :cui2 cui2

-                  :soc soc :cot cot :cof (ensure-integer cof) :coa coa
+                  :cot cot :cof (ensure-integer cof) :coa coa

                   :pfstr2 kpfstr2)))
 
 (defun find-ucon-coc-cui2 (cui2 &key (srl *current-srl*))
                   :pfstr2 kpfstr2)))
 
 (defun find-ucon-coc-cui2 (cui2 &key (srl *current-srl*))


@@ -472,11 +472,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-ucxt-cuisui (cui sui &key (srl *current-srl*))
   (ensure-cui-integer cui)
   (ensure-sui-integer sui)
 (defun find-ucxt-cuisui (cui sui &key (srl *current-srl*))
   (ensure-cui-integer cui)
   (ensure-sui-integer sui)

-  (collect-umlisp-query (mrcxt (sab code cxn cxl rnk cxs cui2 hcd rela xc)
+  (collect-umlisp-query (mrcxt (sab code cxn cxl cxs cui2 hcd rela xc)

                            srl kcuisui (make-cuisui cui sui) :lrl ksrl)
     (make-instance 'ucxt :sab sab :code code
                   :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd
                            srl kcuisui (make-cuisui cui sui) :lrl ksrl)
     (make-instance 'ucxt :sab sab :code code
                   :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd

-                  :rela rela :xc xc :rnk (ensure-integer rnk)
+                  :rela rela :xc xc

                   :cui2 (ensure-integer cui2))))
 
 (defun find-usat-ui (cui &optional (lui nil) (sui nil) &key (srl *current-srl*))
                   :cui2 (ensure-integer cui2))))
 
 (defun find-usat-ui (cui &optional (lui nil) (sui nil) &key (srl *current-srl*))