r7860: add new function, rename old function

diff --git a/package.lisp b/package.lisp
index 4b17dd3529e2fd3449bdfc3f8f122ad074cb8281..1d01ccc199d3a08f1bc5762007bf8e3c36b8c10f 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -81,6 +81,7 @@
    #:find-usty-cui
    #:find-usty-word
    #:find-urel-cui
+   #:find-cui2-urel-cui
    #:find-urel-cui2
    #:find-ucon-rel-cui2
    #:find-ucoc-cui
@@ -98,6 +99,7 @@
    #:find-ucon-cuisui
    #:find-ucon-str
    #:find-ucon-all
+   #:find-cui-ucon-all
    #:map-ucon-all
    #:find-uterm-cui
    #:find-uterm-lui

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 2adc2d81e1a9d6703ae37593b16ad427d21526ba..6ef05ed1dadc5f0a0008ae0b33f7b2b7daa8d9b3 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -256,7 +256,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                   :pfstr kpfstr
                   :lrl (ensure-integer kcuilrl))))
 
-(defun find-ucon-cui-all (&key (srl *current-srl*))
+(defun find-cui-ucon-all (&key (srl *current-srl*))
   "Return list of CUIs for all ucons"
   (collect-umlisp-query (mrcon (cui) srl nil nil :order (cui asc)
                               :distinct t)
@@ -304,6 +304,13 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                   :cui2 (ensure-integer cui2) :rela rela :sab sab :sl sl
                   :mg mg :pfstr2 kpfstr2)))
 
+(defun find-cui2-urel-cui (cui &key (srl *current-srl*))
+  "Return a list of urel for cui"
+  (ensure-cui-integer cui)
+  (collect-umlisp-query (mrrel (cui2) srl cui1
+                              cui :lrl "KSRL")
+                       cui2))
+
 (defun find-urel-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of urel for cui2"
   (ensure-cui-integer cui2)