;;;; 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.15 2003/06/10 22:30:16 kevin Exp $
;;;;
;;;; 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.
(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)
: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)
+ ;;(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)
"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
(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)