projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes needed for 2009AB version of UMLS
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 985bf98900fe5334635fd08f577f2cccf91882f5..207d68c6fa86ef933298fc2576ce6b35e26fb698 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-7,10
+7,8
@@
;;;; Author: Kevin M. Rosenberg
;;;; Created: Apr 2000
;;;;
;;;; Author: Kevin M. Rosenberg
;;;; Created: Apr 2000
;;;;
-;;;; $Id$
-;;;;
;;;; This file, part of UMLisp, is
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-20
06
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-20
10
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.
;;;;
;;;; UMLisp users are granted the rights to distribute and use this software
;;;; as governed by the terms of the GNU General Public License.
@@
-21,9
+19,9
@@
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(:2006ac . "KUMLS2006AC")
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(:2006ac . "KUMLS2006AC")
- (:2006ad . "MTS2006AD")
))
-
(defvar +default-umls-db+ "MTS2006AD"
)
-
+ (:2006ad . "MTS2006AD")
+
(:2009ab . "MTS2009AB"))
)
+(defvar +default-umls-db+ "MTS2009AB")
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
@@
-68,8
+66,12
@@
(setq *umls-sql-type* h))
(defun umls-connection-spec ()
(setq *umls-sql-type* h))
(defun umls-connection-spec ()
- (list *umls-sql-host* *umls-sql-db*
- *umls-sql-user* *umls-sql-passwd*))
+ (if (eql *umls-sql-type* :mysql)
+ (list *umls-sql-host* *umls-sql-db*
+ *umls-sql-user* *umls-sql-passwd*
+ nil '((:local-infile . 1)))
+ (list *umls-sql-host* *umls-sql-db*
+ *umls-sql-user* *umls-sql-passwd*)))
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"