Updates for new debian standards

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 83f38e97164311bea10885f4f95866bfc18800d9..985bf98900fe5334635fd08f577f2cccf91882f5 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -20,8 +20,9 @@
 
 (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)
@@ -73,7 +74,7 @@
 (defun sql-connect ()
   "Connect to UMLS database, automatically used pooled connections"
   (clsql:connect (umls-connection-spec)
-                :database-type *umls-sql-type* :pool t))
+                 :database-type *umls-sql-type* :pool t))
 
 (defun sql-disconnect (conn)
   "Disconnect from UMLS database, but put connection back into pool"
@@ -85,7 +86,7 @@
 (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))
@@ -109,7 +110,7 @@
 (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)