r4758: Auto commit for Debian build

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 54be40c92ec4e81bc4b883771df3683a56342d73..bdb79bd767e77863baa23a2f0209f8b64d9b2462 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.26 2003/05/03 19:52:04 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.32 2003/05/03 20:08:21 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -46,36 +46,36 @@
             (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
                        &key (lrlname "KCUILRL") single distinct order like)
-  (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~}"
-                          (if distinct "distinct " "") (quote fields)))
+  (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)"
+                          (if distinct "distinct " "") fields table))
         (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "")))
-    (concatenate
-     'string
-     (format nil "select ~A from ~:@(~A~)" ,%%fields ,table)
-     (if ,where-name
-        (format nil
-                (if (stringp ,where-value)
-                    (if like
-                        " where ~A like '%~A%'"
-                        " where ~A='~A'")
-                    " where ~A=~A")
-                ,where-name  ,where-value)
-        "")
-     (if ,srl (format nil " and ~:@(~A~) <= ~D" ,lrlname ,srl) "")
-     ,%%order
-     (if ,single " limit 1" "")))
+    `(concatenate
+      'string
+      ,%%fields
+      (if ,where-name
+         (format nil
+                 (if (stringp ,where-value)
+                     (if ,like
+                         " where ~A like '%~A%'"
+                         " where ~A='~A'")
+                     " where ~A=~A")
+                 ,where-name ,where-value)
+         "")
+      (if ,srl (format nil " and ~:@(~A~) <= ~D" ,lrlname ,srl) "")
+      ,%%order
+      (if ,single " limit 1" ""))))
 
 (defun query-string (table fields &optional srl where-name where-value
                     &key (lrlname "KCUILRL") single distinct order like)
@@ -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))))