From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Tue, 24 Jun 2003 00:27:59 +0000 (+0000)
Subject: r5181: *** empty log message ***
X-Git-Tag: v2006ac.2~136
X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=a4851b680b8430b9792d1e86318657de16cf0a96

r5181: *** empty log message ***
---

diff --git a/package.lisp b/package.lisp
index 438d6c9..7981c32 100644
--- 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 72d321e..904e77d 100644
--- 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