;;;; Author: Kevin M. Rosenberg
;;;; Date Started: Apr 2000
;;;;
-;;;; $Id: sql-classes.lisp,v 1.41 2003/05/03 20:33:40 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.42 2003/05/03 20:38:20 kevin Exp $
;;;;
;;;; This file, part of UMLisp, is
;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
(let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)"
(if distinct "distinct " "") fields table))
(%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) ""))
- (%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname)))
+ (%%lrl (format nil " and ~:@(~A~) <= ~~D" lrlname))
+ (%%where (format nil " where ~:@(~A~)" where-name)))
`(concatenate
'string
,%%fields
- (if ,where-name
+ ,@(when where-name (list %%where))
+ (if where-name
(format nil (if (stringp ,where-value)
- (if ,like " where ~A like '%~A%'" " where ~A='~A'")
- " where ~A=~A")
- ,where-name ,where-value)
+ (if ,like " like '%~A%'" "='~A'")
+ "=~A")
+ ,where-value)
"")
(if ,srl (format nil ,%%lrl ,srl) "")
,@(when %%order (list %%order))
(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))))