X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=edbd72af2b19a19b8a014591f51cc1de2b54e0a9;hb=62294ad091ddc6b9bb050ca017b62a69c475dedf;hp=f11b8913e714c020572e2102b5eb08b526080139;hpb=352074f56ada7a912bcdf81723703f3b5c6fb284;p=umlisp.git

diff --git a/sql-classes.lisp b/sql-classes.lisp
index f11b891..edbd72a 100644
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.29 2003/05/03 20:01:18 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.33 2003/05/03 20:09:41 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -33,7 +33,7 @@
 			     &body body)
   (let ((query (gensym)))
     `(unless (and ,where-name (not ,where-value)) 
-      (let ((,query (umlisp-query ,table (quote ,fields) ,srl ,where-name ,where-value
+      (let ((,query (umlisp-query ,table ,fields ,srl ,where-name ,where-value
 				  :lrlname ,lrlname :single ,single :distinct ,distinct
 				  :order ,order :like ,like)))
 	(if ,single
@@ -46,14 +46,14 @@
 	     (destructuring-bind ,fields tuple
 	       ,@body)))))))
 
-(defun umlisp-query (table fields srl where-name where-value
+(defmacro umlisp-query (table fields srl where-name where-value
 		     &key (lrlname "KCUILRL") single distinct order like)
   "Query the UMLisp database. Return a list of umlisp objects whose name
 is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
-  (when (or (not where-name) where-value)
+  `(when (or (not ,where-name) ,where-value)
     (mutex-sql-query
-     (query-string table fields srl where-name where-value 
-		   :lrlname lrlname :single single :distinct distinct :order order :like like))))
+     (query-string-macro ,table ,fields ,srl ,where-name ,where-value 
+      :lrlname ,lrlname :single ,single :distinct ,distinct :order ,order :like ,like))))
 
   
 (defmacro query-string-macro (table fields &optional srl where-name where-value
@@ -63,7 +63,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 	 (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "")))
     `(concatenate
       'string
-      %%fields
+      ,%%fields
       (if ,where-name
 	  (format nil
 		  (if (stringp ,where-value)
@@ -98,7 +98,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 
 (defun find-ucon-cui (cui &key (srl *current-srl*))
   "Find ucon for a cui"
-  (with-umlisp-query ('mrcon (kpfstr kcuilrl) srl 'cui (parse-cui cui) :single t)
+  (with-umlisp-query (mrcon (kpfstr kcuilrl) srl 'cui (parse-cui cui) :single t)
     (make-instance 'ucon :cui (parse-cui cui)
 		   :pfstr kpfstr
 		   :lrl (ensure-integer kcuilrl))))