X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=db2eada53503062bb59b328b25e8e2744ebce455;hb=4210e8b4ffc3b4e5f7cc763829d06288f44a452a;hp=d9990b575b38dee4b15f651cea1d376f5126581b;hpb=a71c8076ec9c8e6049b470133ec0df2d821a7fa5;p=umlisp.git

diff --git a/sql-classes.lisp b/sql-classes.lisp
index d9990b5..db2eada 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.41 2003/05/03 20:33:40 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.42 2003/05/03 20:38:20 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -60,15 +60,17 @@ 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~) <= ~~D" lrlname))
+	 (%%where (format nil " where ~:@(~A~)" where-name)))
     `(concatenate
       'string
       ,%%fields
-      (if ,where-name
+      ,@(when where-name (list %%where))
+      (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 ,like " like '%~A%'" "='~A'")
+			  "=~A")
+		  ,where-value)
 	  "")
       (if ,srl (format nil ,%%lrl ,srl) "")
       ,@(when %%order (list %%order))
@@ -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))))