X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=parse-common.lisp;h=28a57db74ed78405a9b352558c4426f30d655ebe;hb=5be6bdf06e0c99612a4c1a1d6f110e424400d96e;hp=3141b73c54d0dd2eb94fd15e0b6e2c8d498f7f46;hpb=26b92c8df70bcd58358b343db835a599cdc56013;p=umlisp.git

diff --git a/parse-common.lisp b/parse-common.lisp
index 3141b73..28a57db 100644
--- a/parse-common.lisp
+++ b/parse-common.lisp
@@ -7,10 +7,10 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-common.lisp,v 1.12 2003/05/08 01:28:30 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -21,7 +21,7 @@
 (eval-when (:compile-toplevel)
   (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
 
-(defun ensure-init-umls (&optional (alwaysclear nil))
+(defun ensure-ucols+ufiles (&optional (alwaysclear nil))
 "Initialize all UMLS file and column structures if not already initialized"
   (when (or alwaysclear (null *umls-files*))
     (gen-ucols)
@@ -72,7 +72,7 @@ Currently, these are the LEX and NET files."
     (destructuring-bind (filename fields-max fields-av) length-list
       (let ((file (find-ufile filename)))
 	(unless file
-	  (error "Can't find ~A filename in ufiles"))
+	  (error "Can't find ~A filename in ufiles" filename))
 	(unless (= (length fields-max) (length (fields file)))
 	  (error
 	   "Number of file fields ~A not equal to field count in ufile ~S" 
@@ -176,7 +176,9 @@ Currently, these are the LEX and NET files."
 		  (quote-str "'") (custom-value-fun))
   (let ((ucol (make-instance
 	       'ucol
-	       :col col :des des :ref ref :min min :av av :max max :fil fil
+	       :col col :des des :ref ref :min min :av av 
+	       :max (if (eql max 0) 1 max) ;; ensure at least one char wide
+	       :fil fil
 	       :dty dty :sqltype sqltype :quote-str quote-str
 	       :parse-fun (ensure-compiled-fun parse-fun)
  	       :custom-value-fun (ensure-compiled-fun custom-value-fun))))
@@ -184,7 +186,7 @@ Currently, these are the LEX and NET files."
     ucol))
 
 (defun make-empty-ucol (colname filename)
-  (warn "call in make-empty-ucol: ~A/~A" colname filename)
+  ;;(format "call in make-empty-ucol: ~A/~A" colname filename)
   (make-ucol (copy-seq colname) "Unknown" "" nil nil nil filename nil))
 
 (defun find-ucol (colname filename)