X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=-orf%2Fsql.lisp;h=b41b03ab66c089e06e67ab977904469c5228de71;hb=d32c4003c634ec4f8b5c94c99bc67344e01bdbc0;hp=19c58ed3117f039ac3ad69acffa39279ac812ba9;hpb=c5de116ba7fa86f836be56828ded832dd53c623a;p=umlisp.git diff --git a/-orf/sql.lisp b/-orf/sql.lisp index 19c58ed..b41b03a 100644 --- a/-orf/sql.lisp +++ b/-orf/sql.lisp @@ -19,10 +19,10 @@ (in-package #:umlisp-orf) (defvar +umls-sql-map+ - '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA") - (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC") - (:2004AA . "KUMLS2004AA"))) -(defvar +default-umls-db+ :2003AC) + '((:2002ad . "KUMLS2002AD") (:2003aa . "KUMLS2003AA") + (:2003ab . "KUMLS2003AB") (:2003ac . "KUMLS2003AC") + (:2004aa . "KUMLS2004AA"))) +(defvar +default-umls-db+ :2003ac) (defun lookup-db-name (db) @@ -66,8 +66,8 @@ (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*) - :database-type *umls-sql-type* :pool t)) + *umls-sql-user* *umls-sql-passwd*) + :database-type *umls-sql-type* :pool t)) (defun sql-disconnect (conn) "Disconnect from UMLS database, but put connection back into pool" @@ -79,7 +79,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 (stmt conn) @@ -103,7 +103,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)