;;;; $Id$
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-2004 by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-2006 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.
(defun ensure-ucols+ufiles (&optional (alwaysclear nil))
"Initialize all UMLS file and column structures if not already initialized"
- (when (or alwaysclear (null *umls-files*))
- (setq *umls-cols* nil)
- (setq *umls-files* nil)
- (gen-ucols)
- (gen-ufiles)
- (ensure-field-lengths)))
+ (handler-case
+ (when (or alwaysclear (null *umls-files*))
+ (setf *umls-cols* nil *umls-files* nil)
+ (gen-ucols)
+ (gen-ufiles)
+ (ensure-field-lengths))
+ (error (e)
+ (setf *umls-cols* nil *umls-files* nil)
+ (error e)))
+ t)
+
(defun add-ucols (ucols)
"Adds a ucol or list of ucols to *umls-cols*. Returns input value."
(defun ufile-pathname (ufile &optional (extension ""))
"Return pathname for a umls filename with an optional extension"
(assert (typep ufile 'ufile))
- (let ((dirs (append (list (dir ufile))
- (awhen (subdir ufile) (list it)))))
- (merge-pathnames
- (make-pathname :name (concatenate 'string (fil ufile) extension)
+ (let* ((dirs (append (list (dir ufile))
+ (awhen (subdir ufile) (list it))))
+ (name-list (delimited-string-to-list (fil ufile) #\.))
+ (name (if (second name-list)
+ (first name-list)
+ (concatenate 'string (first name-list) (or extension ""))))
+ (type (when (second name-list)
+ (concatenate 'string (second name-list) (or extension "")))))
+ (merge-pathnames
+ (make-pathname :name name :type type
:directory (cons :relative dirs))
*umls-path*)))
"Return pathname for a umls filename with an optional extension"
(etypecase filename
(string
- (merge-pathnames
- (make-pathname :name (concatenate 'string filename extension))
+ (merge-pathnames
+ (make-pathname :name (concatenate 'string filename extension))
(case (schar filename 0)
((#\M #\m)
*meta-path*)
(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"
+ "Number of file fields ~A not equal to field count in ufile ~S"
fields-max file))
(dotimes (i (length (fields file)))
(declare (fixnum i))
(setf (cmax col) (aref fields-max i))
(setf (av col) (aref fields-av i))
(ensure-ucol-datatype col (datatype-for-colname (col col)))))))))
-
+
(defun ufiles-to-measure ()
"Returns a list of ufiles to measure"
(loop for ufile in *umls-files*
unless (or (char= #\M (schar (fil ufile) 0))
(char= #\m (schar (fil ufile) 0)))
collect ufile))
-
-
+
+
(defun ufiles-field-lengths (ufiles)
"Returns a list of lists of containing (FILE MAX AV)"
(loop for ufile in ufiles collect (file-field-lengths ufile)))
(with-umls-ufile (line ufile)
(unless num-fields
(setq num-fields (length line))
- (setq fields-max (make-array num-fields :element-type 'fixnum
+ (setq fields-max (make-array num-fields :element-type 'fixnum
:initial-element 0))
(setq fields-av (make-array num-fields :element-type 'number
:initial-element 0)))
(dotimes (i num-fields)
(declare (fixnum i))
- (let ((len (length (nth i line))))
+ (let* ((str (nth i line))
+ (len (length #-(and clisp unicode) str
+ #+(and clisp unicode)
+ (if *octet-sql-storage*
+ (ext:convert-string-to-bytes str charset:utf-8)
+ str))))
(incf (aref fields-av i) len)
(when (> len (aref fields-max i))
(setf (aref fields-max i) len))))
(quote-str "'") (custom-value-fun))
(let ((ucol (make-instance
'ucol
- :col col :des des :ref ref :min min :av av
+ :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
+ :sqltype sqltype
:quote-str quote-str
:parse-fun (ensure-compiled-fun parse-fun)
:custom-value-fun (ensure-compiled-fun custom-value-fun))))
(ensure-col-in-columns colname filename *umls-cols*))
(defun find-ufile (filename)
- "Returns umls-file structure for a filename"
+ "Returns umls-file structure for a filename"
(find-if #'(lambda (f) (string-equal filename (fil f))) *umls-files*))
(defun find-ucols-for-ufile (ufile)
"Returns list of umls-cols for a file structure"
(loop for colname in (fields ufile)
- collect (find-ucol colname (fil ufile))))
+ collect (find-ucol colname
+ (if (subdir ufile)
+ (concatenate 'string (subdir ufile) "/" (fil ufile))
+ (fil ufile)))))
(defun umls-field-string-to-list (fmt)
"Converts a comma delimited list of fields into a list of field names. Will
ufile)))
(defun datatype-for-colname (colname)
-"Return datatype for column name"
+"Return datatype for column name"
(second (find colname +col-datatypes+ :key #'car :test #'string-equal)))
+(defun canonicalize-column-type (type)
+ (cond
+ ((string-equal type "SMALLINT")
+ (case *umls-sql-type*
+ (:mysql "SMALLINT")
+ ((:postgresql :postgresql-socket) "INT2")
+ (:oracle "NUMBER(5,0)")
+ (t "INTEGER")))
+ ((string-equal type "INTEGER")
+ (case *umls-sql-type*
+ (:mysql "INTEGER")
+ ((:postgresql :postgresql-socket) "INT4")
+ (:oracle "NUMBER(9,0)")
+ (t "INTEGER")))
+ ((string-equal type "BIGINT")
+ (case *umls-sql-type*
+ (:mysql "BIGINT")
+ ((:postgresql :postgresql-socket) "INT8")
+ (:oracle "NUMBER(38,0)")
+ (t "INTEGER")))
+ ((string-equal type "TEXT")
+ (case *umls-sql-type*
+ (:mysql "TEXT")
+ ((:postgresql :postgresql-socket) "TEXT")
+ (:oracle "VARCHAR2(3000)")
+ (t "VARCHAR(3000)")))
+ ((string-equal type "VARCHAR")
+ (case *umls-sql-type*
+ (:mysql "VARCHAR")
+ ((:postgresql :postgresql-socket) "VARCHAR")
+ (:oracle "VARCHAR2")
+ (t "VARCHAR")))
+ ((string-equal type "NUMERIC")
+ (case *umls-sql-type*
+ (:mysql "NUMERIC")
+ ((:postgresql :postgresql-socket) "NUMERIC")
+ (:oracle "NUMBER")
+ (t "NUMERIC")))
+ (t
+ type)))
+
(defun ensure-ucol-datatype (col datatype)
-"Add data type information to column"
+ "Add data type information to column"
(setf (datatype col) datatype)
(case datatype
- (sql-u (setf (sqltype col) "INTEGER"
+ (sql-u (setf (sqltype col) (canonicalize-column-type "INTEGER")
(parse-fun col) #'parse-ui
(quote-str col) ""))
- (sql-s (setf (sqltype col) "SMALLINT"
+ (sql-s (setf (sqltype col) (canonicalize-column-type "SMALLINT")
(parse-fun col) #'parse-integer
(quote-str col) ""))
- (sql-l (setf (sqltype col) "BIGINT"
+ (sql-l (setf (sqltype col) (canonicalize-column-type "BIGINT")
(parse-fun col) #'parse-integer
(quote-str col) ""))
- (sql-i (setf (sqltype col) "INTEGER"
+ (sql-i (setf (sqltype col) (canonicalize-column-type "INTEGER")
(parse-fun col) #'parse-integer
(quote-str col) ""))
- (sql-f (setf (sqltype col) "NUMERIC"
+ (sql-f (setf (sqltype col) (canonicalize-column-type "NUMERIC")
(parse-fun col) #'read-from-string
(quote-str col) ""))
- (t ; Default column type, optimized text storage
- (setf (parse-fun col) #'add-sql-quotes
+ (t ; Default column type, optimized text storage
+ (setf (parse-fun col) #'add-sql-quotes
(quote-str col) "'")
(when (and (cmax col) (av col))
(if (> (cmax col) 255)
- (setf (sqltype col) "TEXT")
- (setf (sqltype col) "VARCHAR"))))))
+ (setf (sqltype col) (canonicalize-column-type "TEXT"))
+ (setf (sqltype col) (canonicalize-column-type "VARCHAR")))))))
(defun escape-column-name (name)
(substitute #\_ #\/ name))
projects / umlisp.git / blobdiff