r9507: rrf updates

[umlisp.git] / sql-classes.lisp

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 3611654bf62e840ce5f37f1c0572ed9a630c3ec4..a7b080414cfebc599c8e3e77bc637d888646e506 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -2,10 +2,10 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          sql-classes.lisp
-;;;; Purpose:       Routines for reading UMLS objects from SQL database
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     sql-classes.lisp
+;;;; Purpose:  Routines for reading UMLS objects from SQL database
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
 ;;;; $Id$
 ;;;;
@@ -41,15 +41,16 @@
       ,%%fields
       ,@(when %%where (list %%where))
       ,@(when %%where
-             `((typecase ,where-value
-                 (fixnum
-                  (concatenate 'string "='" (prefixed-fixnum-string ,where-value #\0 10) "'"))
-                 (number
-                  (concatenate 'string "='" (write-to-string ,where-value) "'"))
-                 (null
-                  " is null")
-                 (t
-                  (format nil ,(if like "'%~A%'" "='~A'") ,where-value)))))
+         `((typecase ,where-value
+             #+ignore
+             (fixnum
+              (concatenate 'string "='" (prefixed-fixnum-string ,where-value #\0 10) "'"))
+             (number
+              (concatenate 'string "='" (write-to-string ,where-value) "'"))
+             (null
+              " is null")
+             (t
+              (format nil ,(if like "'%~A%'" "='~A'") ,where-value)))))
       (if ,srl (concatenate 'string ,%%lrl (write-to-string ,srl)) "")
       ,@(when %%order (list %%order))
       ,@(when single (list " limit 1")))))
@@ -64,7 +65,7 @@
    (if where-name
        (format nil
               (typecase where-value
-                (number "=~D")
+                (number "='~D'")
                 (null " is null")
                 (t
                  (if like " like '%~A%""='~A'")))