X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql.lisp;h=27f6c4d3926eb1af43e6c380ef84419bb04b34b0;hb=bd9f41ad4699320d51c338377b51b75c34bbc647;hp=32cc98d55c5c2bbdec776000392fb1962ba9d063;hpb=75862479bf0f237767673e4df2d9dc2cb45ccbee;p=umlisp.git diff --git a/sql.lisp b/sql.lisp index 32cc98d..27f6c4d 100644 --- a/sql.lisp +++ b/sql.lisp @@ -21,10 +21,11 @@ (:2006ac . "KUMLS2006AC") (:2006ad . "MTS2006AD") (:2009ab . "MTS2009AB") - (:2010aa . "MTS2010AA_ALL") - (:2011aa . "UMLS2011AA") - (:2012aa . "MTS2012AA_ALL"))) -(defvar +default-umls-db+ "MTS2012AA_ALL") + (:2010aa . "MTS2010AA") + (:2012ab . "MTS2012AB") + (:2014ab . "MTS2014AB") + (:2017aa . "KUMLS2017AA"))) +(defvar +default-umls-db+ "KUMLS2017AA") (defun lookup-db-name (db) (cdr (assoc (ensure-keyword db) +umls-sql-map+))) @@ -40,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) @@ -72,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*)))