r4774: Auto commit for Debian build

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index d1dcc91b8c0dc0eedf97c6f98d619383a115e48e..37ed4d1e1313e132540f5d868c0cb9a799a7972f 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.39 2003/05/03 20:32:40 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.48 2003/05/03 21:27:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -60,19 +60,21 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with 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) ""))
-        (%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname)))
+        (%%lrl (format nil " and ~:@(~A~)<=" lrlname))
+        (%%where (format nil " where ~:@(~A~)~A" where-name
+                         (if like " like " "="))))
     `(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)
+      ,@(when %%where (list %%where))
+      (if (quote ,where-name)
+         (if (numberp ,where-value)
+             (write-to-string ,where-value)
+             (format nil ,(if like "'%~A%'" "'~A'") ,where-value))
          "")
-      (if ,srl (format nil ,%%lrl ,srl) "")
+      (if ,srl (concatenate 'string ,%%lrl (write-to-string ,srl)) "")
       ,@(when %%order (list %%order))
-      ,@(when ,single (" limit 1")))))
+      ,@(when single (list " limit 1")))))
 
 (defun query-string (table fields &optional srl where-name where-value
                     &key (lrlname "KCUILRL") single distinct order like)
@@ -95,7 +97,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))))