X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=parse-2002.lisp;h=a42d5b8568a394b539fb8ec36dafe73d9f5521c3;hb=4e62898eedb688c0a44bd257cbcdee07f11ac058;hp=8bbb00915f2ea7781115ce95241ff794e43ce9d3;hpb=965b7cc5c174f0e0b82d1589978f734ea257ed78;p=umlisp.git

diff --git a/parse-2002.lisp b/parse-2002.lisp
index 8bbb009..a42d5b8 100644
--- a/parse-2002.lisp
+++ b/parse-2002.lisp
@@ -5,10 +5,10 @@
 ;;;; Name:          parse-2002.lisp
 ;;;; Purpose:       Parsing and SQL insertion routines for UMLisp which may
 ;;;;                change from year to year
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-2002.lisp,v 1.7 2003/05/06 07:17:35 kevin Exp $
+;;;; $Id: parse-2002.lisp,v 1.8 2003/05/06 07:44:07 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -17,8 +17,10 @@
 ;;;; 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))))
 
 ;;; Pre-read data for custom fields into hash tables
 (defvar *parse-hash-init?* nil)
@@ -379,16 +381,16 @@ append a unique number (starting at 2) onto a column name that is repeated in th
 		:fields (concatenate 'list
 			  (umls-field-string-to-list fmt)
 			  (custom-colnames-for-filename fil)))))
-	(setf (ucols f) (ucols-for-umls-file f))
+	(setf (ucols f) (ucols-for-ufile f))
 	(push f files))))
   (nreverse files)))
 
 (defun init-custom-files ()
   (let ((ffile (make-instance 'ufile
 		     :fil "MRXW.NONENG" :des "Custom NonEnglish Index" :table "MRXW_NONENG"
-		     :cls 5 :rws 0 :bts 0 :fields (fields (find-umls-file "MRXW.ENG")))))
+		     :cls 5 :rws 0 :bts 0 :fields (fields (find-ufile "MRXW.ENG")))))
     (setf (ucols ffile)
-      (ucols-for-umls-file ffile))
+      (ucols-for-ufile ffile))
     (list ffile)))
 
 (defun datatype-for-col (colname)