X-Git-Url: http://git.kpe.io/?p=umlisp-orf.git;a=blobdiff_plain;f=sql-classes.lisp;h=70efa9219ff5b959d8aae388265951a2d54a3a98;hp=13727ba0695ea5925823720394244681db08b8ab;hb=d1954a463a0e58cffdd2d27ba253763d0b5d9c7e;hpb=d8fe27c58aa49f4a19f8b0dc11f97e0db7662e9e

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 13727ba..70efa92 100644
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -240,10 +240,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (with-sql-connection (db)
     (clsql:map-query 
      'list
-     #'(lambda (cui pfstr cuilrl)
-	 (make-instance 'ucon :cui (ensure-integer cui)
-			:pfstr pfstr
-			:lrl (ensure-integer cuilrl)))
+     #'(lambda (tuple)
+	 (destructuring-bind (cui pfstr cuilrl) tuple
+	   (make-instance 'ucon :cui (ensure-integer cui)
+			  :pfstr pfstr
+			  :lrl (ensure-integer cuilrl))))
      (query-string mrcon (cui kpfstr kcuilrl) srl nil nil
 		   :order (cui asc) :distinct t)
      :database db)))
@@ -267,11 +268,12 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (with-sql-connection (db)
     (clsql:map-query 
      nil
-     #'(lambda (cui pfstr cuilrl)
-	 (funcall fn
-		  (make-instance 'ucon :cui (ensure-integer cui)
-				 :pfstr pfstr
-				 :lrl (ensure-integer cuilrl))))
+     #'(lambda (tuple)
+	 (destructuring-bind (cui pfstr cuilrl) tuple
+	   (funcall fn
+		    (make-instance 'ucon :cui (ensure-integer cui)
+				   :pfstr pfstr
+				   :lrl (ensure-integer cuilrl)))))
      (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc)
 		   :distinct t)
      :database db)))
@@ -438,13 +440,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
     (with-sql-connection (db)
       (clsql:map-query 
        'list
-       #'(lambda (cui lui sui stt lrl pfstr)
-	   (make-instance 'ustr :cui (ensure-integer cui)
-			  :lui (ensure-integer lui) :sui (ensure-integer sui)
-			  :stt stt :str pfstr
-			  :cuisui (make-cuisui (ensure-integer cui)
-					       (ensure-integer sui))
-			  :lrl (ensure-integer lrl)))
+       #'(lambda (tuple)
+	   (destructuring-bind (cui lui sui stt lrl pfstr) tuple
+	     (make-instance 'ustr :cui (ensure-integer cui)
+			    :lui (ensure-integer lui) :sui (ensure-integer sui)
+			    :stt stt :str pfstr
+			    :cuisui (make-cuisui (ensure-integer cui)
+						 (ensure-integer sui))
+			  :lrl (ensure-integer lrl))))
        (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl
 		     :distinct t
 		     :order (sui asc))