r4826: *** empty log message ***

[umlisp.git] / sql.lisp

diff --git a/sql.lisp b/sql.lisp
index 3a71e360dfa2494cbab512a67e63116f6351cac8..671e3213be703c208b27053bcd81afb049b9a2f7 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -1,27 +1,38 @@
-;;;;  -*- Mode: LISP; Syntax: Common-Lisp; Base: 10; Pkg: umlisp -*-
-;; SQL/UMLS database Layer over database backend
-;; Copyright (c) 2001 Kevin M. Rosenberg, M.D.
-;; $Id: sql.lisp,v 1.1 2002/10/05 20:17:14 kevin Exp $
-
-(in-package :umlisp)
-
-(declaim (optimize (speed 1) (safety 3)))
-
-(defvar *umls-sql-dsn* "KUMLS2002AC")
-(defun umls-sql-dsn ()
-  *umls-sql-dsn*)
-(defun umls-sql-dsn! (dbname)
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
+;;;; *************************************************************************
+;;;; FILE IDENTIFICATION
+;;;;
+;;;; Name:          sql.lisp
+;;;; Purpose:       Low-level SQL routines data for UMLisp
+;;;; Author:        Kevin M. Rosenberg
+;;;; Date Started:  Apr 2000
+;;;;
+;;;; $Id: sql.lisp,v 1.11 2003/05/06 02:14:59 kevin Exp $
+;;;;
+;;;; This file, part of UMLisp, is
+;;;;    Copyright (c) 2000-2002 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)
+
+(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* "webumls")
+(defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
   *umls-sql-user*)
 (defun umls-sql-user! (u)
   (sql-disconnect-pooled)
   (setq *umls-sql-user* u))
 
-(defvar *umls-sql-passwd* "webumls")
+(defvar *umls-sql-passwd* "secret")
 (defun umls-sql-passwd ()
   *umls-sql-passwd*)
 (defun umls-sql-passwd! (p)
@@ -44,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"
@@ -91,6 +103,3 @@
 (defun mutex-sql-query (cmd &key (types :auto))
   (with-mutex-sql (conn)
     (sql-query cmd conn :types types)))
-
-
-