r5080: *** empty log message ***

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index f93dcfc51e9d384d1837c9de28a4e97947232c27..6b72a68ef91be2df9f7f2be971ccdb32708ceaf1 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -4,28 +4,26 @@
 ;;;;
 ;;;; Name:          sql.lisp
 ;;;; Purpose:       Low-level SQL routines data for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql.lisp,v 1.8 2002/11/11 07:15:48 kevin Exp $
+;;;; $Id: sql.lisp,v 1.12 2003/06/10 22:30:16 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 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.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
 
-
-(defvar *umls-sql-dsn* "KUMLS2002AD")
-(defun umls-sql-dsn ()
-  *umls-sql-dsn*)
-(defun umls-sql-dsn! (dbname)
+(defvar *umls-sql-db* "KUMLS2003AA")
+(defun umls-sql-db ()
+  *umls-sql-db*)
+(defun umls-sql-db! (dbname)
   (sql-disconnect-pooled)
-  (setq *umls-sql-dsn* dbname))
+  (setq *umls-sql-db* dbname))
 
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
@@ -57,8 +55,9 @@
 
 (defun sql-connect ()
   "Connect to UMLS database, automatically used pooled connections"
-  (clsql:connect `(,(umls-sql-host) ,(umls-sql-dsn) ,(umls-sql-user) ,(umls-sql-passwd)) 
-                :database-type *umls-sql-type* :pool t))
+  (clsql:connect
+   `(,(umls-sql-host) ,(umls-sql-db) ,(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"