From: Kevin M. Rosenberg Date: Tue, 21 Sep 2010 14:38:35 +0000 (-0600) Subject: Update for 2010AA release X-Git-Tag: debian-2007ac.2-6~1 X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=6c10979737dc10b0c510b1edfe070346bcac3ff5 Update for 2010AA release --- diff --git a/data-structures.lisp b/data-structures.lisp index 2214088..2db16ae 100644 --- a/data-structures.lisp +++ b/data-structures.lisp @@ -18,7 +18,7 @@ ;;; Paths for files -(defparameter *release* "2009AB") +(defparameter *release* "2010AA") (defparameter *umls-path* (make-pathname :directory (list :absolute "srv" "umls" *release*)) diff --git a/sql.lisp b/sql.lisp index 42b3080..e1414d9 100644 --- a/sql.lisp +++ b/sql.lisp @@ -20,8 +20,9 @@ '((:2004aa . "KUMLS2004AA") (:2006ac . "KUMLS2006AC") (:2006ad . "MTS2006AD") - (:2009ab . "MTS2009AB"))) -(defvar +default-umls-db+ "MTS2009AB") + (:2009ab . "MTS2009AB") + (:2010aa . "MTS2010AA"))) +(defvar +default-umls-db+ "MTS2010AA") (defun lookup-db-name (db) (cdr (assoc (ensure-keyword db) +umls-sql-map+))) @@ -75,10 +76,11 @@ (defun sql-connect () "Connect to UMLS database, automatically used pooled connections" - (clsql:connect (umls-connection-spec) - :database-type *umls-sql-type* - :encoding :utf-8 - :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"