From b35bd5b7cd8ef1721ea03f1df80de7f8b2fb3337 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sat, 3 May 2003 20:07:46 +0000 Subject: [PATCH] r4757: Auto commit for Debian build --- sql-classes.lisp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sql-classes.lisp b/sql-classes.lisp index a4daef4..6d61d39 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.30 2003/05/03 20:03:53 kevin Exp $ +;;;; $Id: sql-classes.lisp,v 1.31 2003/05/03 20:07:46 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -46,14 +46,14 @@ (destructuring-bind ,fields tuple ,@body))))))) -(defun umlisp-query (table fields srl where-name where-value +(defmacro umlisp-query (table fields srl where-name where-value &key (lrlname "KCUILRL") single distinct order like) "Query the UMLisp database. Return a list of umlisp objects whose name is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" - (when (or (not where-name) where-value) + (when (or (not ,where-name) ,where-value) (mutex-sql-query - (query-string table fields srl where-name where-value - :lrlname lrlname :single single :distinct distinct :order order :like like)))) + (query-string-macro ,table ,fields ,srl ,where-name ,where-value + :lrlname ,lrlname :single ,single :distinct ,distinct :order ,order :like ,like)))) (defmacro query-string-macro (table fields &optional srl where-name where-value @@ -98,7 +98,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (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)))) -- 2.34.1