X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=9efcd674240ae37e5326e6e0dbe73ab314ae215f;hb=f259a3855fe02d1d04111f351682028b46934270;hp=9f8c6b1bed06c36eae354ca2ea670219115cd5bb;hpb=4998fa5c059c366d6ed4d87533082c78a6ffb42c;p=umlisp.git

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 9f8c6b1..9efcd67 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.35 2003/05/03 20:18:40 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.44 2003/05/03 20:42:50 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -26,7 +26,6 @@
 (defun current-srl! (srl)
   (setq *current-srl* srl))
 
-
 (defmacro with-umlisp-query ((table fields srl where-name where-value
 				    &key (lrlname "KCUILRL") distinct single
 				    order like)
@@ -40,14 +39,11 @@
 	  (destructuring-bind ,fields tuple
 	    ,@body))))
     `(unless (and ,where-name (not ,where-value)) 
-      (let ((tuple (car )))
-	(loop for tuple in
-	      (umlisp-query ,table ,fields ,srl ,where-name ,where-value
-			    :lrlname ,lrlname :single ,single
-			    :distinct ,distinct :order ,order :like ,like)
-	      collect
-	      (destructuring-bind ,fields tuple
-		,@body))))))
+      (loop for tuple in
+       (umlisp-query ,table ,fields ,srl ,where-name ,where-value
+	:lrlname ,lrlname :single ,single :distinct ,distinct :order ,order :like ,like)
+       collect (destructuring-bind ,fields tuple
+		 ,@body)))))
 
 (defmacro umlisp-query (table fields srl where-name where-value
 		     &key (lrlname "KCUILRL") single distinct order like)
@@ -63,22 +59,22 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 			&key (lrlname "KCUILRL") single distinct order like)
   (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)"
 			   (if distinct "distinct " "") fields table))
-	 (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "")))
+	 (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) ""))
+	 (%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname))
+	 (%%where (format nil " where ~:@(~A~)" where-name)))
     `(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)
+	  (format nil (if (stringp ,where-value)
+			  (if ,like " like '%~A%'" "='~A'")
+			  "=~A")
+		  ,where-value)
 	  "")
-      (if ,srl (format nil " and ~:@(~A~) <= ~D" ,lrlname ,srl) "")
-      ,%%order
-      (if ,single " limit 1" ""))))
+      (if ,srl (format nil ,%%lrl ,srl) "")
+      ,@(when %%order (list %%order))
+      ,@(when single (list " limit 1")))))
 
 (defun query-string (table fields &optional srl where-name where-value
 		     &key (lrlname "KCUILRL") single distinct order like)
@@ -101,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))))
@@ -114,10 +110,10 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       (when srl
 	(string-append ls (format nil " and KCUILRL <= ~d" srl)))
       (string-append ls " limit 1")
-      (awhen (car (mutex-sql-query ls))
-	     (destructuring-bind (kpfstr kcuilrl) it
-		 (make-instance 'ucon :cui cui :pfstr kpfstr
-			    :lrl (ensure-integer kcuilrl)))))))
+      (let ((tuple (car (mutex-sql-query ls))))
+	(destructuring-bind (kpfstr kcuilrl) tuple
+	  (make-instance 'ucon :cui cui :pfstr kpfstr
+			 :lrl (ensure-integer kcuilrl)))))))
 
 (defun find-ucon-cui-sans-pfstr (cui &key (srl *current-srl*))
   "Find ucon for a cui"