From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 3 May 2003 20:24:22 +0000 (+0000)
Subject: r4763: Auto commit for Debian build
X-Git-Tag: v2006ac.2~235
X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=3921045bc3aa458f28e5428f9b7f63d77c42a50c

r4763: Auto commit for Debian build
---

diff --git a/sql-classes.lisp b/sql-classes.lisp
index d3fdda4..d1ec01e 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.36 2003/05/03 20:20:31 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.37 2003/05/03 20:24:22 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)
@@ -67,9 +66,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
       (if ,where-name
 	  (format nil
 		  (if (stringp ,where-value)
-		      (if ,like
-			  " where ~A like '%~A%'"
-			  " where ~A='~A'")
+		      (if ,like " where ~A like '%~A%'" " where ~A='~A'")
 		      " where ~A=~A")
 		  ,where-name ,where-value)
 	  "")
@@ -111,10 +108,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"