X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=d3fdda4f238b590f7d5be4440e96fc50eb00904c;hb=7c9ee6de3bd57576c4f27f1a9aca2ec8ffb03e3b;hp=275686e8e85170ea1d4c987a45187e29e9bc65bd;hpb=dd3e2d80da5c72c86b90f1dd33c0316650027f1b;p=umlisp.git

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 275686e..d3fdda4 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.28 2003/05/03 19:57:11 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.36 2003/05/03 20:20:31 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -31,47 +31,47 @@
 				    &key (lrlname "KCUILRL") distinct single
 				    order like)
 			     &body body)
-  (let ((query (gensym)))
+  (if single
     `(unless (and ,where-name (not ,where-value)) 
-      (let ((,query (umlisp-query ,table (quote ,fields) ,srl ,where-name ,where-value
-				  :lrlname ,lrlname :single ,single :distinct ,distinct
-				  :order ,order :like ,like)))
-	(if ,single
-	    (let ((tuple (car ,query)))
-	      (when tuple
-		(destructuring-bind ,fields tuple
-		  ,@body)))
-	    (loop
-	     for tuple in ,query collect
-	     (destructuring-bind ,fields tuple
-	       ,@body)))))))
-
-(defun umlisp-query (table fields srl where-name where-value
+      (let ((tuple (car (umlisp-query ,table ,fields ,srl ,where-name ,where-value
+				      :lrlname ,lrlname :single ,single
+				      :distinct ,distinct :order ,order :like ,like))))
+	(when tuple
+	  (destructuring-bind ,fields tuple
+	    ,@body))))
+    `(unless (and ,where-name (not ,where-value)) 
+      (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)
   "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 " "") 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)
+      ,%%fields
       (if ,where-name
 	  (format nil
 		  (if (stringp ,where-value)
-		      (if like
+		      (if ,like
 			  " where ~A like '%~A%'"
 			  " where ~A='~A'")
 		      " where ~A=~A")
-		  ,where-name  ,where-value)
+		  ,where-name ,where-value)
 	  "")
       (if ,srl (format nil " and ~:@(~A~) <= ~D" ,lrlname ,srl) "")
       ,%%order
@@ -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))))
@@ -112,7 +112,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 	(string-append ls (format nil " and KCUILRL <= ~d" srl)))
       (string-append ls " limit 1")
       (awhen (car (mutex-sql-query ls))
-	     (destructuring-bind (kpfstr kcuilrl)
+	     (destructuring-bind (kpfstr kcuilrl) it
 		 (make-instance 'ucon :cui cui :pfstr kpfstr
 			    :lrl (ensure-integer kcuilrl)))))))