X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=utils.lisp;h=6c7d08fa7476b00f57e292b6394f293e07203822;hb=5265bd2d2382c51c7bbef19c150466eb1afd58bd;hp=d2a5dd80a2331f6e25b6ab4d17f73349864674f4;hpb=cc146d0b1c7d6d7a050713754f1ea9a8d71a46b5;p=umlisp.git

diff --git a/utils.lisp b/utils.lisp
index d2a5dd8..6c7d08f 100644
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: utils.lisp,v 1.4 2003/05/06 02:14:59 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.
@@ -39,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)
@@ -54,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)
@@ -62,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)
@@ -70,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)
@@ -78,7 +78,7 @@
       (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)
@@ -91,7 +91,7 @@
 
 (defun decompose-cuisui (cuisui)
   "Returns the CUI and SUI of a cuisui number"
-  (floor cuisui cuisui +cuisui-scale+))
+  (floor cuisui +cuisui-scale+))
 
 ;;; Lookup functions for uterms,ustr in ucons