X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql.lisp;h=82af22b282da669dd8a92b4e233060ace99d01b9;hb=e6ef11f4c42de5a6754f73d9a714a0213b3a0133;hp=ef3be08ee04b4cd16cb7cf089fbab9a2dadb214f;hpb=48b70ea69d92b01f3e3795855581f8af8869b01f;p=umlisp.git

diff --git a/sql.lisp b/sql.lisp
index ef3be08..82af22b 100644
--- a/sql.lisp
+++ b/sql.lisp
@@ -2,30 +2,42 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          sql.lisp
-;;;; Purpose:       Low-level SQL routines data for UMLisp
-;;;; Programmer:    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.5 2002/10/16 16:05:23 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2006 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-map+
+    '((:2004aa . "KUMLS2004AA")
+      (:2006ac . "KUMLS2006AC")
+      (:2006ad . "MTS2006AD")))
+(defvar +default-umls-db+ "MTS2006AD")
 
-(defvar *umls-sql-dsn* "KUMLS2002AC")
-(defun umls-sql-dsn ()
-  *umls-sql-dsn*)
-(defun umls-sql-dsn! (dbname)
-  (sql-disconnect-pooled)
-  (setq *umls-sql-dsn* dbname))
+
+(defun lookup-db-name (db)
+  (cdr (assoc (ensure-keyword db) +umls-sql-map+)))
+
+(defvar *umls-sql-db* +default-umls-db+)
+(defun umls-sql-db ()
+  *umls-sql-db*)
+
+(defun umls-sql-db! (db)
+  (etypecase db
+    (string
+     (setq *umls-sql-db* db))
+    (keyword
+     (setq *umls-sql-db* (lookup-db-name db)))))
 
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
@@ -55,9 +67,13 @@
   (sql-disconnect-pooled)
   (setq *umls-sql-type* h))
 
+(defun umls-connection-spec ()
+  (list *umls-sql-host* *umls-sql-db*
+        *umls-sql-user* *umls-sql-passwd*))
+
 (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)) 
+  (clsql:connect (umls-connection-spec)
 		 :database-type *umls-sql-type* :pool t))
 
 (defun sql-disconnect (conn)
@@ -73,17 +89,17 @@
 	 (progn ,@body)
        (when ,conn (clsql:disconnect :database ,conn)))))
 
+(defun sql-query (cmd conn &key (result-types :auto))
+  (clsql:query cmd :database conn :result-types result-types :field-names nil))
+
+(defun sql-execute (cmd conn)
+  (clsql:execute-command cmd :database conn))
+
 (defun sql (stmt conn)
   (if (string-equal "SELECT" (subseq stmt 0 6))
       (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-execute (cmd conn)
-  (clsql:execute-command cmd :database conn))
-
 (defun umls-sql (stmt)
   (check-type stmt string)
   (with-sql-connection (conn)
@@ -101,28 +117,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)))
-
-
-
-(defun make-usrl ()
-  (with-sql-connection (conn)
-    (sql-execute "drop table if exists USRL" conn)
-    (sql-execute "create table USRL (sab varchar(80), srl integer)" conn)
-    (dolist (tuple (mutex-sql-query "select distinct SAB,SRL from MRSO order by SAB asc"))
-      (sql-execute (format nil "insert into USRL (sab,srl) values ('~a',~d)" 
-			   (car tuple) (ensure-integer (cadr tuple)))
-		   conn)))
-  (find-usrl-all))
-
-(defun find-usrl-all ()
-  (let ((usrls '())
-	(tuples (mutex-sql-query "select SAB,SRL from USRL order by SAB desc")))
-    (dolist (tuple tuples)
-      (push (make-instance 'usrl :sab (nth 0 tuple)
-			   :srl (ensure-integer (nth 1 tuple))) usrls))
-    usrls))
-
-
+    (sql-query cmd conn :result-types result-types)))