r9537:

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 550cb2c9ebe231c9f7400a3f7fc46019d65e74dc..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)
-  (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
-                  :mg mg :pfstr2 kpfstr2)))
+                  :pfstr2 kpfstr2)))
 
 (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)
-  (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
-                  :mg mg :pfstr2 kpfstr2)))
+                  :pfstr2 kpfstr2)))
 
 (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)
-  (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)
-                  :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)
-  (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
-                  :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*))
@@ -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)
-  (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
-                  :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*))
@@ -804,24 +804,21 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       (insert-ustats-count conn "Concept Count" "MRCONSO" "distinct CUI" "KCUILRL" srl)
       (insert-ustats-count conn "Term Count" "MRCONSO" "distinct KCUILUI" "KCUILRL" srl)
       (insert-ustats-count conn "Distinct Term Count" "MRCONSO" "distinct LUI" "KLUILRL" srl)
-      (insert-ustats-count conn "String Count" "MRCONSO" "*" "LRL" srl)
-      (insert-ustats-count conn "Distinct String Count" "MRCONSO" "distinct SUI" "LRL" srl)
+      (insert-ustats-count conn "String Count" "MRCONSO" "*" "KSUILRL" srl)
+      (insert-ustats-count conn "Distinct String Count" "MRCONSO" "distinct SUI" "KSUILRL" srl)
       (insert-ustats-count conn "Context Count" "MRCXT" "*" "KSRL" srl)
       (insert-ustats-count conn "Co-occuring Concept Count" "MRCOC" "*" "KLRL" srl)
       (insert-ustats-count conn "Definition Count" "MRDEF" "*" "KSRL" srl)
+      #+ignore
       (insert-ustats-count conn "Locator Count" "MRLO" "*" "KLRL" srl)
       (insert-ustats-count conn "Rank Count" "MRRANK" "*" "KSRL" srl)
       (insert-ustats-count conn "Relationship Count" "MRREL" "*" "KSRL" srl)
       (insert-ustats-count conn "Semantic Type Count" "MRSTY" "*" "KLRL" srl)
       (insert-ustats-count conn "Simple Attribute Count" "MRSAT" "*" "KSRL" srl)
-      (insert-ustats-count conn "Source Count" "MRSO" "*" "SRL" srl)
+      (insert-ustats-count conn "Source Abbreviation Count" "MRSAB" "*" "SRL" srl)
       (insert-ustats-count conn "Word Index Count" "MRXW_ENG" "*" "KLRL" srl)
       (insert-ustats-count conn "Normalized Word Index Count" "MRXNW_ENG" "*" "KLRL" srl)
-      (insert-ustats-count conn "Normalized String Index Count" "MRXNS_ENG" "*" "KLRL" srl)
-      (insert-ustats-count conn "Bonus Attribute Name Count" "BONUS_ATN" "*" nil srl)
-      (insert-ustats-count conn "Bonus Relationship Count" "BONUS_REL" "*" nil srl)
-      (insert-ustats-count conn "Bonus Source Abbreviation Count" "BONUS_SAB" "*" nil srl)
-      (insert-ustats-count conn "Bonus Term Type Count" "BONUS_TTY" "*" nil srl))
+      (insert-ustats-count conn "Normalized String Index Count" "MRXNS_ENG" "*" "KLRL" srl))
     (sql-execute "create index USTATS_SRL on USTATS (SRL)" conn))
   (find-ustats-all))