r4789: Auto commit for Debian build

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 92539c816662eb7edc817f8106c3c57fea281c4d..207d7001c822f1a12e5d663bbb2869f564a8c2f1 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.59 2003/05/04 00:45:35 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.63 2003/05/04 01:25:24 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -55,7 +55,8 @@
                                         &key (lrl "KCUILRL") distinct single
                                         order like)
                                  &body body)
-  (let ((value (gensym)))
+  (let ((value (gensym))
+       (eval-fields (cadr fields)))
     (if single
        `(let ((,value ,where-value))
          (when ,value 
@@ -64,7 +65,7 @@
                                            :distinct ,distinct :order ,order
                                            :like ,like))))
              (when tuple
-               (destructuring-bind ,fields tuple
+               (destructuring-bind ,eval-fields tuple
                  ,@body)))))
        `(let ((,value ,where-value))
          (when ,value 
@@ -72,11 +73,10 @@
                  (umlisp-query-eval ,table ,fields ,srl ,where-name ,value
                                     :lrl ,lrl :single ,single :distinct ,distinct
                                     :order ,order :like ,like)
-                 collect (destructuring-bind ,fields tuple
+                 collect (destructuring-bind ,eval-fields tuple
                            ,@body)))))))
 
 
-
 (defmacro umlisp-query (table fields srl where-name where-value
                     &key (lrl "KCUILRL") single distinct order like)
   "Query the UMLisp database. Return a list of umlisp objects whose name
@@ -204,7 +204,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
         (make-instance 'ucon :cui (ensure-integer cui)
                        :pfstr pfstr
                        :lrl (ensure-integer cuilrl)))
-     (query-string-macro mrcon (cui kpfstr kcuilrl) srl nil nil
+     (query-string mrcon (cui kpfstr kcuilrl) srl nil nil
                   :order (cui asc) :distinct t)
      :database db)))
 
@@ -218,7 +218,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                  (make-instance 'ucon :cui (ensure-integer cui)
                                 :pfstr pfstr
                                 :lrl (ensure-integer cuilrl))))
-     (query-string-macro mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) :distinct t)
+     (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) :distinct t)
      :database db)))
 
 
@@ -362,7 +362,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
                          :stt stt
                          :lrl lrl
                          :str pfstr))
-       (query-string-macro mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl :distinct t
+       (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl :distinct t
                     :order (sui asc))
        :database db)))
 
@@ -457,13 +457,13 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-ucon-word (word &key (srl *current-srl*) (like nil))
   "Return list of ucons that match word. Optionally, use SQL's LIKE syntax"
   (with-umlisp-query-eval ('mrxw_eng '(cui) srl 'wd word :like like :distinct t
-                                    :lrl klrl :order '(cui asc))
+                                    :lrl 'klrl :order '(cui asc))
     (find-ucon-cui cui :srl srl)))
 
 (defun find-ucon-normalized-word (word &key (srl *current-srl*) (like nil))
   "Return list of ucons that match word, optionally use SQL's LIKE syntax"
   (with-umlisp-query-eval ('mrxnw_eng '(cui) srl 'nwd word :like like :distinct t
-                                     :lrl klrl :order '(cui asc))
+                                     :lrl 'klrl :order '(cui asc))
     (find-ucon-cui cui :srl srl)))
 
 (defun find-ustr-word (word &key (srl *current-srl*))