projects
/
umlisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates for new debian standards
[umlisp.git]
/
sql.lisp
diff --git
a/sql.lisp
b/sql.lisp
index d2900d6d2a8bb40231d52cac24d6cc18b08e3c19..985bf98900fe5334635fd08f577f2cccf91882f5 100644
(file)
--- a/
sql.lisp
+++ b/
sql.lisp
@@
-20,8
+20,9
@@
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(defvar +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
- (:2006ac . "KUMLS2006AC")))
-(defvar +default-umls-db+ :2006ac)
+ (:2006ac . "KUMLS2006AC")
+ (:2006ad . "MTS2006AD")))
+(defvar +default-umls-db+ "MTS2006AD")
(defun lookup-db-name (db)
(defun lookup-db-name (db)
@@
-32,7
+33,11
@@
*umls-sql-db*)
(defun umls-sql-db! (db)
*umls-sql-db*)
(defun umls-sql-db! (db)
- (setq *umls-sql-db* db))
+ (etypecase db
+ (string
+ (setq *umls-sql-db* db))
+ (keyword
+ (setq *umls-sql-db* (lookup-db-name db)))))
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
(defvar *umls-sql-user* "secret")
(defun umls-sql-user ()
@@
-62,11
+67,14
@@
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
+(defun umls-connection-spec ()
+ (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"
- (clsql:connect (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
- *umls-sql-user* *umls-sql-passwd*)
- :database-type *umls-sql-type* :pool t))
+ (clsql:connect (umls-connection-spec)
+ :database-type *umls-sql-type* :pool t))
(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"
@@
-78,7
+86,7
@@
(defmacro with-sql-connection ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
(defmacro with-sql-connection ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
- (progn ,@body)
+
(progn ,@body)
(when ,conn (clsql:disconnect :database ,conn)))))
(defun sql-query (cmd conn &key (result-types :auto))
(when ,conn (clsql:disconnect :database ,conn)))))
(defun sql-query (cmd conn &key (result-types :auto))
@@
-102,7
+110,7
@@
(defmacro with-mutex-sql ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
(defmacro with-mutex-sql ((conn) &body body)
`(let ((,conn (sql-connect)))
(unwind-protect
- (progn ,@body)
+
(progn ,@body)
(when ,conn (sql-disconnect ,conn)))))
(defun mutex-sql-execute (cmd)
(when ,conn (sql-disconnect ,conn)))))
(defun mutex-sql-execute (cmd)