X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql.lisp;h=86f689328f0b2925819c5285874d993ebc6fe4fc;hb=aeade16272b79115d3f307906c7a3e9597137e97;hp=dfb85aaa3edb99deddb4f21c78b74c3414f45064;hpb=685f8f4ab5c9a6ea5581e4f340e5b70665587114;p=umlisp.git

diff --git a/sql.lisp b/sql.lisp
index dfb85aa..86f6893 100644
--- a/sql.lisp
+++ b/sql.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          sql.lisp
-;;;; Purpose:       Low-level SQL routines data for UMLisp
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     sql.lisp
+;;;; Purpose:  Low-level SQL routines data for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: sql.lisp,v 1.16 2003/08/08 09:20:51 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2004 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.
@@ -20,8 +20,9 @@
 
 (defvar +umls-sql-map+
     '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
-      (:2003AB . "KUMLS2003AB")))
-(defvar +default-umls-db+ :2003AB)
+      (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
+      (:2004AA . "KUMLS2004AA")))
+(defvar +default-umls-db+ :2003AC)
 
 
 (defun lookup-db-name (db)
@@ -34,8 +35,6 @@
 (defun umls-sql-db! (db)
   (setq *umls-sql-db* db))
 
-(umls-sql-db! :2003AB)
-
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
   *umls-sql-user*)
@@ -88,8 +87,8 @@
       (sql-query stmt conn)
     (sql-execute stmt conn)))
 
-(defun sql-query (cmd conn &key (types :auto))
-  (clsql:query cmd :database conn :types types))
+(defun sql-query (cmd conn &key (result-types :auto))
+  (clsql:query cmd :database conn :result-types result-types))
 
 (defun sql-execute (cmd conn)
   (clsql:execute-command cmd :database conn))
@@ -111,6 +110,6 @@
   (with-mutex-sql (conn)
     (sql-execute cmd conn)))
 
-(defun mutex-sql-query (cmd &key (types :auto))
+(defun mutex-sql-query (cmd &key (result-types :auto))
   (with-mutex-sql (conn)
-    (sql-query cmd conn :types types)))
+    (sql-query cmd conn :result-types result-types)))