From 8f3656e6e27fb26069dc9f6b8018c9c2cd3b7b2a Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Mon, 26 May 2003 14:53:33 +0000
Subject: [PATCH] r5032: *** empty log message ***

---
 class-support.lisp | 12 +++++++++++-
 package.lisp       |  9 ++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/class-support.lisp b/class-support.lisp
index 6aeef26..f7975e7 100644
--- a/class-support.lisp
+++ b/class-support.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:       Kevin M. Rosenberg
 ;;;; Date Started: Apr 2000
 ;;;;
-;;;; $Id: class-support.lisp,v 1.8 2003/05/15 05:16:44 kevin Exp $
+;;;; $Id: class-support.lisp,v 1.9 2003/05/26 14:53:33 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -128,6 +128,16 @@
   "Return the string for a ulo object"
   (find-string-sui (sui lo)))
 
+(defmethod uterm-pfstr (uterm)
+  "Return the preferred string for a uterm"
+  (dolist (ustr (s#str uterm))
+    (when (string= "PF" (stt ustr))
+      (return-from uterm-pfstr (str ustr)))))
+
+(defmethod remove-non-english-terms (uterms)
+  (remove-if-not #'english-term-p uterms))
+
+
 #+(or scl cmu)
 (dolist (c '(urank udef usat uso ucxt ustr ulo uterm usty urel ucoc uatx ucon uxw uxnw uxns lexterm labr lagr lcmp lmod lnom lprn lprp lspl ltrm ltyp lwd sdef sstr sstre1 sstre2 usrl))
     #+cmu
diff --git a/package.lisp b/package.lisp
index 081df86..38ace45 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: package.lisp,v 1.18 2003/05/06 02:14:59 kevin Exp $
+;;;; $Id: package.lisp,v 1.19 2003/05/26 14:53:33 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -36,12 +36,15 @@
    #:rsab #:lat
    #:s#def #:s#sty #:s#term #:s#str #:s#atx #:s#lo #:s#sat #:s#rel #:s#coc
    #:s#so #:s#cxt
-
+   #:pfstr #:pfstr2 #:lrl #:def #:ts #:cui1 #:cui2 #:rela #:sl #:mg #:rel
+   #:soc #:cot #:cof #:coa
+   
    ;; From class-support.lisp
    #:ucon-has-tui
-   #:english-term-p
+   #:english-term-p #:remove-non-english-terms
    #:fmt-cui #:fmt-tui #:fmt-sui #:fmt-eui #:fmt-tui
    #:display-con #:display-term #:display-str
+   #:uterm-pfstr
    
    ;; From sql.lisp
    #:umls-sql-user!
-- 
2.34.1