r11448: counter is not used on all platforms

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index d2900d6d2a8bb40231d52cac24d6cc18b08e3c19..82af22b282da669dd8a92b4e233060ace99d01b9 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)
@@ -32,7 +33,11 @@
   *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 ()
@@ -62,10 +67,13 @@
   (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"
-  (clsql:connect (list *umls-sql-host* (lookup-db-name *umls-sql-db*)
-                      *umls-sql-user* *umls-sql-passwd*)
+  (clsql:connect (umls-connection-spec)
                 :database-type *umls-sql-type* :pool t))
 
 (defun sql-disconnect (conn)