X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql.lisp;h=7c6cc2c42c01df87469ef44b363d1a93c72ef19a;hb=6b0acc8fd6324c9a8000d224808a50a781ea8c74;hp=dab38b8ba2d29bb059cacf073ca6fbcd23a0cf0b;hpb=8894876c0e1bc1ce0a3e1680b804e4df7efce2b8;p=umlisp.git

diff --git a/sql.lisp b/sql.lisp
index dab38b8..7c6cc2c 100644
--- a/sql.lisp
+++ b/sql.lisp
@@ -8,7 +8,7 @@
 ;;;; 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.
@@ -16,14 +16,16 @@
 
 (in-package #:umlisp)
 
-(defvar +umls-sql-map+
+(defparameter +umls-sql-map+
     '((:2004aa . "KUMLS2004AA")
       (:2006ac . "KUMLS2006AC")
       (:2006ad . "MTS2006AD")
       (:2009ab . "MTS2009AB")
       (:2010aa . "MTS2010AA")
-      (:2012ab . "MTS2012AB")))
-(defvar +default-umls-db+ "MTS2012AB")
+      (:2012ab_all . "MTS2012AB_ALL")
+      (:2014ab . "MTS2014AB")
+      (:2017aa . "KUMLS2017AA")))
+(defvar +default-umls-db+ "MTS2012AB_ALL")
 
 (defun lookup-db-name (db)
   (cdr (assoc (ensure-keyword db) +umls-sql-map+)))
@@ -39,14 +41,14 @@
     (keyword
      (setq *umls-sql-db* (lookup-db-name db)))))
 
-(defvar *umls-sql-user* "secret")
+(defvar *umls-sql-user* "umls")
 (defun umls-sql-user ()
   *umls-sql-user*)
 (defun set-umls-sql-user (u)
   (sql-disconnect-pooled)
   (setq *umls-sql-user* u))
 
-(defvar *umls-sql-passwd* "secret")
+(defvar *umls-sql-passwd* "umls")
 (defun umls-sql-passwd ()
   *umls-sql-passwd*)
 (defun set-umls-sql-passwd (p)
@@ -71,7 +73,8 @@
   (if (eql *umls-sql-type* :mysql)
       (list *umls-sql-host* *umls-sql-db*
             *umls-sql-user* *umls-sql-passwd*
-            nil '((:local-infile . 1)))
+            nil '((:local-infile . 1))
+            )
     (list *umls-sql-host* *umls-sql-db*
           *umls-sql-user* *umls-sql-passwd*)))