Update for 2010AA release

diff --git a/data-structures.lisp b/data-structures.lisp
index 2214088c3561c1f28f04efa78cb54bcf0d6f3bb7..2db16ae8a8738e715c614b5a761bebe21c0e5b89 100644 (file)
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -18,7 +18,7 @@
 
 ;;; Paths for files
 
 
 ;;; Paths for files
 

-(defparameter *release* "2009AB")
+(defparameter *release* "2010AA")

 
 (defparameter *umls-path*
   (make-pathname :directory (list :absolute "srv" "umls" *release*))
 
 (defparameter *umls-path*
   (make-pathname :directory (list :absolute "srv" "umls" *release*))

diff --git a/sql.lisp b/sql.lisp
index 42b30802cd6fc8e9aa535a9b70edf3d472c6ad0e..e1414d9d0840015702adcb18e5d22a112c1a92e6 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -20,8 +20,9 @@
     '((:2004aa . "KUMLS2004AA")
       (:2006ac . "KUMLS2006AC")
       (:2006ad . "MTS2006AD")
     '((: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+)))
 
 (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"
 
 (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"
 
 (defun sql-disconnect (conn)
   "Disconnect from UMLS database, but put connection back into pool"