r5126: *** empty log message ***

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 02182f67a0c6fe126df92a0f19cdc86d968a56b4..72d321e9ffba7b79077a144f48e42378b274a1d4 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,17 +7,16 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.82 2003/05/16 03:10:18 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.85 2003/06/10 22:57:45 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
 
 
 (defvar *current-srl* nil)
@@ -463,14 +462,17 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (ensure-cui-integer cui)
   (ensure-lui-integer lui)
   (ensure-sui-integer sui)
-  (let ((ls (format nil "select CODE,ATN,SAB,ATV from MRSAT where ")))
+  (let ((ls "select CODE,ATN,SAB,ATV from MRSAT where "))
     (cond
-      (sui (string-append ls (format nil "KCUISUI=~D" (make-cuisui cui sui))))
-      (lui (string-append ls (format nil "KCUILUI=~D and sui=0"
-                                    (make-cuilui cui lui))))
-      (t (string-append ls (format nil "cui=~D and lui=0 and sui=0" cui))))
+      (sui (string-append ls "KCUISUI="
+                         (integer-string (make-cuisui cui sui) 14)))
+      (lui (string-append ls "KCUILUI="
+                         (integer-string (make-cuilui cui lui) 14)
+                         " and sui=0"))
+      (t (string-append ls "cui=" (prefixed-fixnum-string cui nil 7)
+                       " and lui=0 and sui=0")))
     (when srl
-      (string-append ls (format nil " and KSRL <= ~D" srl)))
+      (string-append ls " and KSRL<=" (prefixed-fixnum-string srl nil 3)))
     (loop for tuple in (mutex-sql-query ls) collect 
          (destructuring-bind (code atn sab atv) tuple
            (make-instance 'usat :code code :atn atn :sab sab :atv atv)))))