r5181: *** empty log message ***

diff --git a/package.lisp b/package.lisp
index 438d6c9f3f7ea8be4b69173c8ce14b8d4e6a01f8..7981c3262593b1501efed9d75364ffd5e9bfe282 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.22 2003/06/16 03:23:50 kevin Exp $
+;;;; $Id: package.lisp,v 1.23 2003/06/24 00:27:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
@@ -122,6 +122,8 @@
    #:find-ucon-normalized-word
    #:find-ustr-word
    #:find-ustr-normalized-word
+   #:find-uterm-word
+   #:find-uterm-normalized-word
    #:find-ucon-multiword
    #:find-ucon-normalized-multiword
    #:find-ustr-multiword

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 72d321e9ffba7b79077a144f48e42378b274a1d4..904e77d30a24f2ddcc09d54a5bf6dc5e246fdc56 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.85 2003/06/10 22:57:45 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.86 2003/06/24 00:27:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
@@ -563,6 +563,18 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                                 :order (cui asc sui asc))
     (find-ustr-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl)))
 
+(defun find-uterm-word (word &key (srl *current-srl*))
+  "Return list of uterms that match word"
+  (collect-umlisp-query (mrxw_eng (cui sui) srl wd word :lrl klrl
+                              :order (cui asc sui asc))
+    (find-uterm-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl)))
+
+(defun find-uterm-normalized-word (word &key (srl *current-srl*))
+  "Return list of uterms that match word"
+  (collect-umlisp-query (mrxnw_eng (cui sui) srl nwd word :lrl klrl
+                                :order (cui asc sui asc))
+    (find-uterm-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl)))
+
 (defun find-ucon-noneng-word (word &key (srl *current-srl*) (like nil))
   "Return list of ucons that match non-english word"
   (collect-umlisp-query-eval ('mrxw_noneng '(cui) srl 'wd word :like like