projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix LEX directory name
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index 207d68c6fa86ef933298fc2576ce6b35e26fb698..b98d0a29053c155f73f7834d1408cdb94dc30f96 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-8,7
+8,7
@@
;;;; Created: Apr 2000
;;;;
;;;; This file, part of UMLisp, is
;;;; Created: Apr 2000
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-201
0
by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-201
2
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.
@@
-16,12
+16,16
@@
(in-package #:umlisp)
(in-package #:umlisp)
-(def
va
r +umls-sql-map+
+(def
paramete
r +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(:2006ac . "KUMLS2006AC")
(:2006ad . "MTS2006AD")
'((:2004aa . "KUMLS2004AA")
(:2006ac . "KUMLS2006AC")
(:2006ad . "MTS2006AD")
- (:2009ab . "MTS2009AB")))
-(defvar +default-umls-db+ "MTS2009AB")
+ (:2009ab . "MTS2009AB")
+ (:2010aa . "MTS2010AA")
+ (:2012ab_all . "MTS2012AB_ALL")
+ (:2014ab . "MTS2014AB")
+ (:2017aa . "KUMLS2017AA")))
+(defvar +default-umls-db+ "MTS2012AB_ALL")
(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+)))
@@
-30,38
+34,38
@@
(defun umls-sql-db ()
*umls-sql-db*)
(defun umls-sql-db ()
*umls-sql-db*)
-(defun
umls-sql-db!
(db)
+(defun
set-umls-sql-db
(db)
(etypecase db
(string
(setq *umls-sql-db* db))
(keyword
(setq *umls-sql-db* (lookup-db-name db)))))
(etypecase db
(string
(setq *umls-sql-db* db))
(keyword
(setq *umls-sql-db* (lookup-db-name db)))))
-(defvar *umls-sql-user* "
secret
")
+(defvar *umls-sql-user* "
mts
")
(defun umls-sql-user ()
*umls-sql-user*)
(defun umls-sql-user ()
*umls-sql-user*)
-(defun
umls-sql-user!
(u)
+(defun
set-umls-sql-user
(u)
(sql-disconnect-pooled)
(setq *umls-sql-user* u))
(sql-disconnect-pooled)
(setq *umls-sql-user* u))
-(defvar *umls-sql-passwd* "
secret
")
+(defvar *umls-sql-passwd* "
_mts
")
(defun umls-sql-passwd ()
*umls-sql-passwd*)
(defun umls-sql-passwd ()
*umls-sql-passwd*)
-(defun
umls-sql-passwd!
(p)
+(defun
set-umls-sql-passwd
(p)
(sql-disconnect-pooled)
(setq *umls-sql-passwd* p))
(sql-disconnect-pooled)
(setq *umls-sql-passwd* p))
-(defvar *umls-sql-host* "
localhost
")
+(defvar *umls-sql-host* "
sql1.med-info.com
")
(defun umls-sql-host ()
*umls-sql-host*)
(defun umls-sql-host ()
*umls-sql-host*)
-(defun
umls-sql-host!
(h)
+(defun
set-umls-sql-host
(h)
(sql-disconnect-pooled)
(setq *umls-sql-host* h))
(defvar *umls-sql-type* :mysql)
(defun umls-sql-type ()
*umls-sql-type*)
(sql-disconnect-pooled)
(setq *umls-sql-host* h))
(defvar *umls-sql-type* :mysql)
(defun umls-sql-type ()
*umls-sql-type*)
-(defun
umls-sql-type!
(h)
+(defun
set-umls-sql-type
(h)
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
@@
-69,14
+73,18
@@
(if (eql *umls-sql-type* :mysql)
(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)))
+ 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"
(list *umls-sql-host* *umls-sql-db*
*umls-sql-user* *umls-sql-passwd*)))
(defun sql-connect ()
"Connect to UMLS database, automatically used pooled connections"
- (clsql:connect (umls-connection-spec)
- :database-type *umls-sql-type* :pool t))
+ (let ((db (clsql:connect (umls-connection-spec)
+ :database-type *umls-sql-type*
+ :encoding :utf-8
+ :pool t)))
+ db))
(defun sql-disconnect (conn)
"Disconnect from UMLS database, but put connection back into pool"
(defun sql-disconnect (conn)
"Disconnect from UMLS database, but put connection back into pool"