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

diff --git a/parse-common.lisp b/parse-common.lisp
index d4f7922..3141b73 100644
--- a/parse-common.lisp
+++ b/parse-common.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: parse-common.lisp,v 1.9 2003/05/07 21:57:06 kevin Exp $
+;;;; $Id: parse-common.lisp,v 1.12 2003/05/08 01:28:30 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -159,18 +159,32 @@ Currently, these are the LEX and NET files."
        :datatype (datatype ucol) :custom-value-fun (custom-value-fun ucol))
       (make-empty-ucol colname filename)))
 
+(defun ensure-compiled-fun (fun)
+  "Ensure that a function is compiled"
+  (etypecase fun
+    (null
+     nil)
+    (function
+     (if (compiled-function-p fun)
+	 fun
+	 (compile nil fun)))
+    (list
+     (compile nil fun))))
+
 (defun make-ucol (col des ref min av max fil dty
 		  &key (sqltype "VARCHAR") (parse-fun #'add-sql-quotes)
 		  (quote-str "'") (custom-value-fun))
   (let ((ucol (make-instance
 	       'ucol
 	       :col col :des des :ref ref :min min :av av :max max :fil fil
-	       :dty dty :sqltype sqltype :parse-fun parse-fun
-	       :quote-str quote-str :custom-value-fun custom-value-fun)))
+	       :dty dty :sqltype sqltype :quote-str quote-str
+	       :parse-fun (ensure-compiled-fun parse-fun)
+ 	       :custom-value-fun (ensure-compiled-fun custom-value-fun))))
     (ensure-ucol-datatype ucol (datatype-for-colname col))
     ucol))
 
 (defun make-empty-ucol (colname filename)
+  (warn "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)
@@ -181,10 +195,10 @@ Currently, these are the LEX and NET files."
   "Returns umls-file structure for a filename"  
   (find-if #'(lambda (f) (string-equal filename (fil f))) *umls-files*))
 
-(defun find-ucols-for-filename (filename)
+(defun find-ucols-for-ufile (ufile)
   "Returns list of umls-cols for a file structure"
-  (loop for colname in (fields (find-ufile filename))
-	collect (find-ucol colname filename)))
+  (loop for colname in (fields ufile)
+	collect (find-ucol colname (fil ufile))))
 
 (defun umls-field-string-to-list (fmt)
   "Converts a comma delimited list of fields into a list of field names. Will
@@ -192,21 +206,19 @@ append a unique number (starting at 2) onto a column name that is repeated in th
   (let ((col-counts (make-hash-table :test 'equal)))
     (loop for colname in (delimited-string-to-list (escape-column-name fmt) #\,)
 	  collect
-	  (multiple-value-bind (value found) (gethash col col-counts)
+	  (multiple-value-bind (value found) (gethash colname col-counts)
 	    (cond
 	      (found
-		(incf (gethash col col-counts))
+		(incf (gethash colname col-counts))
 		(concatenate 'string colname (write-to-string (1+ value))))
 	      (t
-	       (setf (gethash col col-counts) 1)
+	       (setf (gethash colname col-counts) 1)
 	       colname))))))
 
 (defun make-ufile (fil des table cls rws bts fields)
-  (let ((ufile
-	 (make-instance
-	  'ufile :fil fil :des des :table table :cls cls :rws rws :bts bts
-	  :fields fields)))
-    (setf (ucols ufile) (find-ucols-for-filename fil))
+  (let ((ufile (make-instance 'ufile :fil fil :des des :table table :cls cls
+			      :rws rws :bts bts :fields fields)))
+    (setf (ucols ufile) (find-ucols-for-ufile ufile))
     ufile))
 
 (defun datatype-for-colname (colname)