X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=6c7d08fa7476b00f57e292b6394f293e07203822;hb=965b7cc5c174f0e0b82d1589978f734ea257ed78;hp=c25cf1dfb955f48fda76a85ae1b3f360ea01c77d;hpb=bfdd5c9d3d66970759fcdbee5a51da2ca93ddf06;p=umlisp.git

diff --git a/utils.lisp b/utils.lisp
index c25cf1d..6c7d08f 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; Name:          utils.lisp
 ;;;; Purpose:       Low-level utility functions for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.2 2002/10/09 23:03:41 kevin Exp $
+;;;; $Id: utils.lisp,v 1.6 2003/05/06 02:36:58 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,8 +16,11 @@
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
  
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
+
+(eval-when (:compile-toplevel)
+  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
+
 (declaim (inline make-cuisui make-cuilui parse-ui parse-cui))
 
 (defmacro def-metaclass-reader (field)
@@ -36,14 +39,14 @@
   "Return integer value for a UMLS unique identifier."
   (if (< (length s) 2)
       nullvalue
-    (parse-integer s :start 1)))
+    (nth-value 0 (parse-integer s :start 1))))
 
 (defun parse-cui (cui)
   (if (stringp cui)
       (let ((ch (aref cui 0)))
 	(if (eql ch #\C)
 	    (parse-ui cui)
-	  (parse-integer cui)))
+	    (nth-value 0 (parse-integer cui))))
     cui))
     
 (defun parse-lui (lui)
@@ -51,7 +54,7 @@
       (let ((ch (aref lui 0)))
 	(if (eql ch #\L)
 	    (parse-ui lui)
-	  (parse-integer lui)))
+	    (nth-value 0 (parse-integer lui))))
     lui))
     
 (defun parse-sui (sui)
@@ -59,7 +62,7 @@
       (let ((ch (aref sui 0)))
 	(if (eql ch #\S)
 	    (parse-ui sui)
-	  (parse-integer sui)))
+	    (nth-value 0 (parse-integer sui))))
     sui))
     
 (defun parse-tui (tui)
@@ -67,7 +70,7 @@
       (let ((ch (aref tui 0)))
 	(if (eql ch #\T)
 	    (parse-ui tui)
-	  (parse-integer tui)))
+	    (nth-value 0 (parse-integer tui))))
     tui))
 
 (defun parse-eui (eui)
@@ -75,21 +78,31 @@
       (let ((ch (aref eui 0)))
 	(if (eql ch #\E)
 	    (parse-ui eui)
-	  (parse-integer eui)))
+	    (nth-value 0 (parse-integer eui))))
     eui))
     
 (defconstant +cuisui-scale+ 10000000)
 
 (defun make-cuisui (cui sui)
-  (declare (fixnum cui sui))
-  (the integer (+ (* +cuisui-scale+ cui) sui)))
+  (+ (* +cuisui-scale+ cui) sui))
 
 (defun make-cuilui (cui lui)
-  (declare (fixnum cui lui))
-  (the integer (+ (* +cuisui-scale+ cui) lui)))
+  (+ (* +cuisui-scale+ cui) lui))
 
 (defun decompose-cuisui (cuisui)
-  (declare (integer cuisui))
-  (let* ((cui (the fixnum (truncate (/ cuisui +cuisui-scale+))))
-	(sui (the fixnum (- cuisui (* cui +cuisui-scale+)))))
-    (values cui sui)))
+  "Returns the CUI and SUI of a cuisui number"
+  (floor cuisui +cuisui-scale+))
+
+;;; Lookup functions for uterms,ustr in ucons
+
+(defun find-uterm-in-ucon (ucon lui)
+  (find lui (s#term ucon) :key #'lui :test 'equal))
+
+(defun find-ustr-in-uterm (uterm sui)
+  (find sui (s#str uterm) :key #'sui :test 'equal))
+
+(defun find-ustr-in-ucon (ucon sui)
+  (dolist (uterm (s#term ucon))
+    (dolist (ustr (s#str uterm))
+      (when (string-equal sui (sui ustr))
+	(return-from find-ustr-in-ucon ustr)))))