r4757: Auto commit for Debian build

diff --git a/sql-classes.lisp b/sql-classes.lisp
index a4daef4c6565504a586c6794ba1cd45be784ca16..6d61d394c7d8a417ee8939fe3d2346d293b2b875 100644 (file)
--- 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.30 2003/05/03 20:03:53 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.31 2003/05/03 20:07:46 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -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
@@ -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))))