;;;; Created: Apr 2000
;;;;
;;;; This file, part of UMLisp, is
-;;;; Copyright (c) 2000-2010 by Kevin M. Rosenberg, M.D.
+;;;; Copyright (c) 2000-2012 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.
(in-package #:umlisp)
-(defvar +umls-sql-map+
+(defparameter +umls-sql-map+
'((:2004aa . "KUMLS2004AA")
(:2006ac . "KUMLS2006AC")
(:2006ad . "MTS2006AD")
- (:2009ab . "MTS2009AB")))
-(defvar +default-umls-db+ "MTS2009AB")
+ (:2009ab . "MTS2009AB")
+ (:2010aa . "MTS2010AA")
+ (:2012ab . "MTS2012AB")))
+(defvar +default-umls-db+ "MTS2012AA_ALL")
(defun lookup-db-name (db)
(cdr (assoc (ensure-keyword db) +umls-sql-map+)))
(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))
(defvar *umls-sql-user* "secret")
(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))
(defvar *umls-sql-passwd* "secret")
(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))
(defvar *umls-sql-host* "localhost")
(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*)
-(defun umls-sql-type! (h)
+(defun set-umls-sql-type (h)
(sql-disconnect-pooled)
(setq *umls-sql-type* h))
(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"