r4820: *** empty log message ***

[umlisp.git] / parse-common.lisp

diff --git a/parse-common.lisp b/parse-common.lisp
index 8ba30e61bf9be0c4c52c68774fac2ed169372a92..c47acb40aa20c1d7f1db60e23b22b478bfcc0ce9 100644 (file)
--- a/parse-common.lisp
+++ b/parse-common.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-common.lisp,v 1.4 2002/10/21 02:23:46 kevin Exp $
+;;;; $Id: parse-common.lisp,v 1.5 2003/05/05 23:13:28 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -37,19 +37,19 @@
     (pathname
       filename)))
 
-(defun read-umls-line (strm)
+(defun read-umls-line-new (strm)
   "Read a line from a UMLS stream, split into fields"
   (let ((line (read-line strm nil 'eof)))
     (if (stringp line) ;; ensure not 'eof
-       (let* ((len (length line))
-             (maybe-remove-terminal ;; LRWD doesn't have '|' at end of line
-              (if (char= #\| (char line (1- len)))
-                  (subseq line 0 (1- len))
-                line)))
-         (declare (fixnum len))
-         (delimited-string-to-list maybe-remove-terminal #\|))
+       (delimited-string-to-list line #\| t)
       line)))
 
+(defun read-umls-line (strm)
+  "Read a line from a UMLS stream, split into fields"
+  (let ((line (read-line strm nil 'eof)))
+    (if (stringp line) ;; ensure not 'eof
+       (delimited-string-to-list line #\| t)
+      line)))
 
 ;;; Find field lengths for LEX and NET files