From: Kevin M. Rosenberg Date: Sun, 11 May 2003 21:48:31 +0000 (+0000) Subject: r4899: Auto commit for Debian build X-Git-Tag: v2006ac.2~170 X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=7944be8bd05235ef44a13aa8808621da9b26124c;hp=9c0bccac3fb46e0cb8ab6d2a63b7fc5a92221002;p=umlisp.git r4899: Auto commit for Debian build --- diff --git a/sql-classes.lisp b/sql-classes.lisp index 9e71b0f..1a765a4 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.75 2003/05/07 22:53:36 kevin Exp $ +;;;; $Id: sql-classes.lisp,v 1.76 2003/05/11 21:48:31 kevin Exp $ ;;;; ;;;; This file, part of UMLisp, is ;;;; Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D. @@ -155,43 +155,74 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" ;;; ;;; Read from SQL database +(defmacro ensure-cui-integer (cui) + `(if (stringp ,cui) + (setq ,cui (parse-cui ,cui)) + ,cui)) + +(defmacro ensure-lui-integer (lui) + `(if (stringp ,lui) + (setq ,lui (parse-lui ,lui)) + ,lui)) + +(defmacro ensure-sui-integer (sui) + `(if (stringp ,sui) + (setq ,sui (parse-sui ,sui)) + ,sui)) + +(defmacro ensure-tui-integer (tui) + `(if (stringp ,tui) + (setq ,tui (parse-tui ,tui)) + ,tui)) + +(defmacro ensure-eui-integer (eui) + `(if (stringp ,eui) + (setq ,eui (parse-eui ,eui)) + ,eui)) + (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) - (make-instance 'ucon :cui (parse-cui cui) :pfstr kpfstr + (ensure-cui-integer cui) + (with-umlisp-query (mrcon (kpfstr kcuilrl) srl cui cui :single t) + (make-instance 'ucon :cui cui :pfstr kpfstr :lrl (ensure-integer kcuilrl)))) (defun find-ucon-cui-sans-pfstr (cui &key (srl *current-srl*)) "Find ucon for a cui" - (with-umlisp-query (mrcon (kcuilrl) srl cui (parse-cui cui) :single t) - (make-instance 'ucon :cui (parse-cui cui) :lrl (ensure-integer kcuilrl) + (ensure-cui-integer cui) + (with-umlisp-query (mrcon (kcuilrl) srl cui cui :single t) + (make-instance 'ucon :cui cui :lrl (ensure-integer kcuilrl) :pfstr nil))) (defun find-pfstr-cui (cui &key (srl *current-srl*)) "Find preferred string for a cui" - (with-umlisp-query (mrcon (kpfstr) srl cui (parse-cui cui) :single t) + (ensure-cui-integer cui) + (with-umlisp-query (mrcon (kpfstr) srl cui cui :single t) kpfstr)) (defun find-ucon-lui (lui &key (srl *current-srl*)) "Find list of ucon for lui" - (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl lui (parse-lui lui) + (ensure-lui-integer lui) + (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl lui lui :distinct t) (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr :lrl (ensure-integer kcuilrl)))) (defun find-ucon-sui (sui &key (srl *current-srl*)) "Find list of ucon for sui" - (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl sui (parse-sui sui) - :distinct t) + (ensure-sui-integer sui) + (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl sui sui :distinct t) (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr :lrl (ensure-integer kcuilrl)))) (defun find-ucon-cuisui (cui sui &key (srl *current-srl*)) "Find ucon for cui/sui" + (ensure-cui-integer cui) + (ensure-sui-integer sui) (when (and cui sui) - (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl kcuisui - (make-cuisui (parse-cui cui) (parse-sui sui))) - (make-instance 'ucon :cui (ensure-integer cui) + (with-umlisp-query (mrcon (kpfstr kcuilrl) srl kcuisui + (make-cuisui cui sui)) + (make-instance 'ucon :cui cui :pfstr kpfstr :lrl (ensure-integer kcuilrl))))) @@ -239,12 +270,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-udef-cui (cui &key (srl *current-srl*)) "Return a list of udefs for cui" - (with-umlisp-query (mrdef (sab def) srl cui (parse-cui cui) :lrl "KSRL") + (ensure-cui-integer cui) + (with-umlisp-query (mrdef (sab def) srl cui cui :lrl "KSRL") (make-instance 'udef :sab sab :def def))) (defun find-usty-cui (cui &key (srl *current-srl*)) "Return a list of usty for cui" - (with-umlisp-query (mrsty (tui sty) srl cui (parse-cui cui) :lrl "KLRL") + (ensure-cui-integer cui) + (with-umlisp-query (mrsty (tui sty) srl cui cui :lrl "KLRL") (make-instance 'usty :tui (ensure-integer tui) :sty sty))) (defun find-usty-word (word &key (srl *current-srl*)) @@ -255,88 +288,101 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-urel-cui (cui &key (srl *current-srl*)) "Return a list of urel for cui" + (ensure-cui-integer cui) (with-umlisp-query (mrrel (rel cui2 rela sab sl mg kpfstr2) srl cui1 - (parse-cui cui) :lrl "KSRL") - (make-instance 'urel :cui1 (parse-cui cui) :rel rel + cui :lrl "KSRL") + (make-instance 'urel :cui1 cui :rel rel :cui2 (ensure-integer cui2) :rela rela :sab sab :sl sl :mg mg :pfstr2 kpfstr2))) (defun find-urel-cui2 (cui2 &key (srl *current-srl*)) "Return a list of urel for cui2" + (ensure-cui-integer cui2) (with-umlisp-query (mrrel (rel cui1 rela sab sl mg kpfstr2) srl cui2 - (parse-cui cui2) :lrl "KSRL") - (make-instance 'urel :cui2 (parse-cui cui2) :rel rel + cui2 :lrl "KSRL") + (make-instance 'urel :cui2 cui2 :rel rel :cui1 (ensure-integer cui1) :rela rela :sab sab :sl sl :mg mg :pfstr2 kpfstr2))) (defun find-ucon-rel-cui2 (cui2 &key (srl *current-srl*)) + (ensure-cui-integer cui2) (loop for cui in (remove-duplicates (mapcar #'cui1 (find-urel-cui2 cui2 :srl srl))) collect (find-ucon-cui cui :srl srl))) (defun find-ucoc-cui (cui &key (srl *current-srl*)) "Return a list of ucoc for cui" + (ensure-cui-integer cui) (with-umlisp-query (mrcoc (cui2 soc cot cof coa kpfstr2) srl cui1 - (parse-cui cui) :lrl klrl :order (cof asc)) + cui :lrl klrl :order (cof asc)) (setq cui2 (ensure-integer cui2)) (when (zerop cui2) (setq cui2 nil)) - (make-instance 'ucoc :cui1 (parse-cui cui) :cui2 (ensure-integer cui2) + (make-instance 'ucoc :cui1 cui :cui2 (ensure-integer cui2) :soc soc :cot cot :cof (ensure-integer cof) :coa coa :pfstr2 kpfstr2))) (defun find-ucoc-cui2 (cui2 &key (srl *current-srl*)) "Return a list of ucoc for cui2" + (ensure-cui-integer cui2) (with-umlisp-query (mrcoc (cui1 soc cot cof coa kpfstr2) srl cui2 - (parse-cui cui2) :lrl klrl :order (cof asc)) - (setq cui2 (ensure-integer cui2)) + cui2 :lrl klrl :order (cof asc)) (when (zerop cui2) (setq cui2 nil)) - (make-instance 'ucoc :cui1 (ensure-integer cui1) :cui2 (parse-cui cui2) + (make-instance 'ucoc :cui1 (ensure-integer cui1) :cui2 cui2 :soc soc :cot cot :cof (ensure-integer cof) :coa coa :pfstr2 kpfstr2))) (defun find-ucon-coc-cui2 (cui2 &key (srl *current-srl*)) "List of ucon with co-occurance cui2" + (ensure-cui-integer cui2) (mapcar #'(lambda (cui) (find-ucon-cui cui :srl srl)) (remove-duplicates (mapcar #'cui1 (find-ucoc-cui2 cui2 :srl srl))))) (defun find-ulo-cui (cui &key (srl *current-srl*)) "Return a list of ulo for cui" - (with-umlisp-query (mrlo (isn fr un sui sna soui) srl cui (parse-cui cui) + (ensure-cui-integer cui) + (with-umlisp-query (mrlo (isn fr un sui sna soui) srl cui cui :lrl "KLRL") (make-instance 'ulo :isn isn :fr (ensure-integer fr) :un un :sui (ensure-integer sui) :sna sna :soui soui))) (defun find-uatx-cui (cui &key (srl *current-srl*)) "Return a list of uatx for cui" - (with-umlisp-query (mratx (sab rel atx) srl cui (parse-cui cui) :lrl ksrl) + (ensure-cui-integer cui) + (with-umlisp-query (mratx (sab rel atx) srl cui cui :lrl ksrl) (make-instance 'uatx :sab sab :rel rel :atx atx))) (defun find-uterm-cui (cui &key (srl *current-srl*)) "Return a list of uterm for cui" - (with-umlisp-query (mrcon (lui lat ts kluilrl) srl cui (parse-cui cui) + (ensure-cui-integer cui) + (with-umlisp-query (mrcon (lui lat ts kluilrl) srl cui cui :lrl kluilrl :distinct t) - (make-instance 'uterm :lui (ensure-integer lui) :cui (parse-cui cui) + (make-instance 'uterm :lui (ensure-integer lui) :cui cui :lat lat :ts ts :lrl (ensure-integer kluilrl)))) (defun find-uterm-lui (lui &key (srl *current-srl*)) "Return a list of uterm for lui" - (with-umlisp-query (mrcon (cui lat ts kluilrl) srl lui (parse-lui lui) + (ensure-lui-integer lui) + (with-umlisp-query (mrcon (cui lat ts kluilrl) srl lui lui :lrl kluilrl :distinct t) - (make-instance 'uterm :cui (ensure-integer cui) :lui (parse-lui lui) + (make-instance 'uterm :cui (ensure-integer cui) :lui lui :lat lat :ts ts :lrl (ensure-integer kluilrl)))) (defun find-uterm-cuilui (cui lui &key (srl *current-srl*)) "Return single uterm for cui/lui" + (ensure-cui-integer cui) + (ensure-lui-integer lui) (with-umlisp-query (mrcon (lat ts kluilrl) srl kcuilui - (make-cuilui (parse-cui cui) (parse-lui lui)) + (make-cuilui cui lui) :lrl kluilrl :single t) (make-instance 'uterm :cui cui :lui lui :lat lat :ts ts :lrl (ensure-integer kluilrl)))) (defun find-ustr-cuilui (cui lui &key (srl *current-srl*)) "Return a list of ustr for cui/lui" + (ensure-cui-integer cui) + (ensure-lui-integer lui) (with-umlisp-query (mrcon (sui stt str lrl) srl kcuilui (make-cuilui cui lui) :lrl lrl) (make-instance 'ustr :sui (ensure-integer sui) :cui cui :lui lui @@ -345,6 +391,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-ustr-cuisui (cui sui &key (srl *current-srl*)) "Return the single ustr for cuisui" + (ensure-cui-integer cui) + (ensure-sui-integer sui) (with-umlisp-query (mrcon (lui stt str lrl) srl kcuisui (make-cuisui cui sui) :lrl lrl :single t) (make-instance 'ustr :sui sui :cui cui :cuisui (make-cuisui cui sui) @@ -353,10 +401,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-ustr-sui (sui &key (srl *current-srl*)) "Return the list of ustr for sui" - (with-umlisp-query (mrcon (cui lui stt str lrl) srl sui (parse-sui sui) + (ensure-sui-integer sui) + (with-umlisp-query (mrcon (cui lui stt str lrl) srl sui sui :lrl lrl) (make-instance 'ustr :sui sui :cui cui :stt stt :str str - :cuisui (make-cuisui (ensure-integer cui) (parse-sui sui)) + :cuisui (make-cuisui (ensure-integer cui) sui) :lui (ensure-integer lui) :lrl (ensure-integer lrl)))) (defun find-ustr-sab (sab &key (srl *current-srl*)) @@ -387,15 +436,20 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-string-sui (sui &key (srl *current-srl*)) "Return the string associated with sui" + (ensure-sui-integer sui) (with-umlisp-query (mrcon (str) srl sui sui :lrl lrl :single t) str)) (defun find-uso-cuisui (cui sui &key (srl *current-srl*)) + (ensure-sui-integer sui) + (ensure-cui-integer cui) (with-umlisp-query (mrso (sab code srl tty) srl kcuisui (make-cuisui cui sui) :lrl srl) (make-instance 'uso :sab sab :code code :srl srl :tty tty))) (defun find-ucxt-cuisui (cui sui &key (srl *current-srl*)) + (ensure-cui-integer cui) + (ensure-sui-integer sui) (with-umlisp-query (mrcxt (sab code cxn cxl rnk cxs cui2 hcd rela xc) srl kcuisui (make-cuisui cui sui) :lrl ksrl) (make-instance 'ucxt :sab sab :code code @@ -404,6 +458,9 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :cui2 (ensure-integer cui2)))) (defun find-usat-ui (cui &optional (lui nil) (sui nil) &key (srl *current-srl*)) + (ensure-cui-integer cui) + (ensure-lui-integer lui) + (ensure-sui-integer sui) (let ((ls (format nil "select CODE,ATN,SAB,ATV from MRSAT where "))) (cond (sui (string-append ls (format nil "KCUISUI=~D" (make-cuisui cui sui)))) @@ -418,8 +475,9 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-usty-tui (tui) "Find usty for tui" - (with-umlisp-query (mrsty (sty) nil tui (parse-tui tui) :single t) - (make-instance 'usty :tui (parse-tui tui) :sty sty))) + (ensure-tui-integer tui) + (with-umlisp-query (mrsty (sty) nil tui tui :single t) + (make-instance 'usty :tui tui :sty sty))) (defun find-usty-sty (sty) "Find usty for a sty" @@ -473,7 +531,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-ucon-tui (tui &key (srl *current-srl*)) "Find list of ucon for tui" - (with-umlisp-query (mrsty (cui) srl tui (parse-tui tui) :lrl klrl :order (cui asc)) + (ensure-tui-integer tui) + (with-umlisp-query (mrsty (cui) srl tui tui :lrl klrl :order (cui asc)) (find-ucon-cui (ensure-integer cui) :srl srl))) (defun find-ucon-word (word &key (srl *current-srl*) (like nil)) @@ -589,6 +648,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" ;;; LEX SQL functions (defun find-lexterm-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrwd (wrd) nil eui eui :single t) (make-instance 'lexterm :eui eui :wrd wrd))) @@ -600,6 +660,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" ;; LEX SQL Read functions (defun find-labr-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrabr (bas abr eui2 bas2) nil eui eui) (make-instance 'labr :eui eui :bas bas :abr abr :bas2 bas2 :eui2 (ensure-integer eui2)))) @@ -610,41 +671,50 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :bas (copy-seq bas) :eui2 (ensure-integer eui2)))) (defun find-lagr-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lragr (str sca agr cit bas) nil eui eui) (make-instance 'lagr :eui eui :str str :sca sca :agr agr :cit cit :bas bas))) (defun find-lcmp-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrcmp (bas sca com) nil eui eui) (make-instance 'lcmp :eui eui :bas bas :sca sca :com com))) (defun find-lmod-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrmod (bas sca psn_mod fea) nil eui eui) (make-instance 'lmod :eui eui :bas bas :sca sca :psnmod psn_mod :fea fea))) (defun find-lnom-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrnom (bas sca eui2 bas2 sca2) nil eui eui) (make-instance 'lnom :eui eui :bas bas :sca sca :bas2 bas2 :sca2 sca2 :eui2 (ensure-integer eui2)))) (defun find-lprn-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrprn (bas num gnd cas pos qnt fea) nil eui eui) (make-instance 'lprn :eui eui :bas bas :num num :gnd gnd :cas cas :pos pos :qnt qnt :fea fea))) (defun find-lprp-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrprp (bas str sca fea) nil eui eui) (make-instance 'lprp :eui eui :bas bas :str str :sca sca :fea fea))) (defun find-lspl-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrspl (spv bas) nil eui eui) (make-instance 'lspl :eui eui :spv spv :bas bas))) (defun find-ltrm-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrtrm (bas gen) nil eui eui) (make-instance 'ltrm :eui eui :bas bas :gen gen))) (defun find-ltyp-eui (eui) + (ensure-eui-integer eui) (with-umlisp-query (lrtyp (bas sca typ) nil eui eui) (make-instance 'ltyp :eui eui :bas bas :sca sca :typ typ)))