X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=1a765a4a4f19a8071ade948e733c4644c761b6b4;hb=5265bd2d2382c51c7bbef19c150466eb1afd58bd;hp=6a3ccd0fc79e3c551bc3e7c9cb4facbe4a456c96;hpb=bffd495fce24fb06ba627f7e94703870d6031939;p=umlisp.git diff --git a/sql-classes.lisp b/sql-classes.lisp index 6a3ccd0..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.68 2003/05/04 03:45:05 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. @@ -30,7 +30,9 @@ &key (lrl "KCUILRL") single distinct order like) (let* ((%%fields (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)" (if distinct "distinct " "") fields table)) - (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "")) + (%%order (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" + order) + "")) (%%lrl (format nil " and ~:@(~A~)<=" lrl)) (%%where (when where-name (format nil " where ~:@(~A~)~A" where-name @@ -57,18 +59,17 @@ 'string (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)" (if distinct "distinct " "") fields table) + (if where-name (format nil " where ~:@(~A~)" where-name) "") (if where-name (format nil (typecase where-value - (number " where ~A=~D") - (null " where ~A is null") + (number "=~D") + (null " is null") (t - (if like - " where ~A like '%~A%'" - " where ~A='~A'"))) - where-name where-value) + (if like " like '%~A%""='~A'"))) + where-value) "") - (if srl (format nil " and ~:@(~A~) <= ~D" lrl srl) "") + (if srl (format nil " and ~:@(~A~)<=~D" lrl srl) "") (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "") (if single " limit 1" ""))) @@ -94,7 +95,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" &key (lrl "KCUILRL") distinct single order like) &body body) - (let ((value (gensym))) + (let ((value (gensym)) + (r (gensym))) (if single `(let* ((,value ,where-value) (tuple (car (umlisp-query ,table ,fields ,srl ,where-name ,value @@ -106,19 +108,26 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (destructuring-bind ,fields tuple ,@body))) `(let ((,value ,where-value)) - ,@(unless where-name `((declare (ignore ,value)))) - (loop for tuple in - (umlisp-query ,table ,fields ,srl ,where-name ,value - :lrl ,lrl :single ,single :distinct ,distinct - :order ,order :like ,like) - collect (destructuring-bind ,fields tuple - ,@body)))))) + ,@(unless where-name `((declare (ignore ,value)))) + (let ((,r '())) + (dolist (tuple (umlisp-query ,table ,fields ,srl ,where-name ,value + :lrl ,lrl :single ,single :distinct ,distinct + :order ,order :like ,like)) + (push (destructuring-bind ,fields tuple ,@body) ,r)) + (nreverse ,r)) + #+ignore + (loop for tuple in + (umlisp-query ,table ,fields ,srl ,where-name ,value + :lrl ,lrl :single ,single :distinct ,distinct + :order ,order :like ,like) + collect (destructuring-bind ,fields tuple ,@body)))))) (defmacro with-umlisp-query-eval ((table fields srl where-name where-value &key (lrl "KCUILRL") distinct single order like) &body body) (let ((value (gensym)) + (r (gensym)) (eval-fields (cadr fields))) (if single `(let* ((,value ,where-value) @@ -129,53 +138,91 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (when tuple (destructuring-bind ,eval-fields tuple ,@body))) - `(let ((,value ,where-value)) - (loop for tuple in - (umlisp-query-eval ,table ,fields ,srl ,where-name ,value - :lrl ,lrl :single ,single :distinct ,distinct - :order ,order :like ,like) - collect (destructuring-bind ,eval-fields tuple - ,@body)))))) + `(let ((,value ,where-value) + (,r '())) + (dolist (tuple (umlisp-query-eval ,table ,fields ,srl ,where-name ,value + :lrl ,lrl :single ,single :distinct ,distinct + :order ,order :like ,like)) + (push (destructuring-bind ,eval-fields tuple ,@body) ,r)) + (nreverse ,r) + #+ignore + (loop for tuple in + (umlisp-query-eval ,table ,fields ,srl ,where-name ,value + :lrl ,lrl :single ,single :distinct ,distinct + :order ,order :like ,like) + collect (destructuring-bind ,eval-fields tuple ,@body)))))) ;;; ;;; 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) :distinct t) + (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) - (make-instance 'ucon :cui (ensure-integer cui) - :pfstr kpfstr + (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))))) @@ -198,6 +245,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :order (cui asc) :distinct t) :database db))) +(defun find-ucon-all2 (&key (srl *current-srl*)) + "Return list of all ucon's" + (with-umlisp-query (mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) + :distinct t) + (make-instance 'ucon :cui (ensure-integer cui) + :pfstr kpfstr + :lrl (ensure-integer kcuilrl)))) + (defun map-ucon-all (fn &key (srl *current-srl*)) "Map a function over all ucon's" (with-sql-connection (db) @@ -208,123 +263,149 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (make-instance 'ucon :cui (ensure-integer cui) :pfstr pfstr :lrl (ensure-integer cuilrl)))) - (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) :distinct t) + (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc) + :distinct t) :database db))) (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*)) "Return a list of usty that match word" - (with-umlisp-query (mrsty (tui sty) srl sty word :lrl klrl :like t :distinct t) + (with-umlisp-query (mrsty (tui sty) srl sty word :lrl klrl :like t + :distinct t) (make-instance 'usty :tui (ensure-integer tui) :sty sty))) (defun find-urel-cui (cui &key (srl *current-srl*)) "Return a list of urel for 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 :cui2 (ensure-integer cui2) - :rela rela :sab sab :sl sl :mg mg :pfstr2 kpfstr2))) + (ensure-cui-integer cui) + (with-umlisp-query (mrrel (rel cui2 rela sab sl mg kpfstr2) srl cui1 + 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" - (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 :cui1 (ensure-integer cui1) - :rela rela :sab sab :sl sl :mg mg :pfstr2 kpfstr2))) + (ensure-cui-integer cui2) + (with-umlisp-query (mrrel (rel cui1 rela sab sl mg kpfstr2) srl cui2 + 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*)) - (mapcar - #'(lambda (cui) (find-ucon-cui cui :srl srl)) - (remove-duplicates (mapcar #'cui1 (find-urel-cui2 cui2 :srl 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" - (with-umlisp-query (mrcoc (cui2 soc cot cof coa kpfstr2) srl cui1 (parse-cui cui) - :lrl "KSRL" :order (cof asc)) + (ensure-cui-integer cui) + (with-umlisp-query (mrcoc (cui2 soc cot cof coa kpfstr2) srl cui1 + 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) :soc soc - :cot cot :cof (ensure-integer cof) :coa coa :pfstr2 kpfstr2))) + (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" - (with-umlisp-query (mrcoc (cui1 soc cot cof coa kpfstr2) srl cui2 (parse-cui cui2) - :lrl "KSRL" :order (cof asc)) - (setq cui2 (ensure-integer cui2)) + (ensure-cui-integer cui2) + (with-umlisp-query (mrcoc (cui1 soc cot cof coa kpfstr2) srl cui2 + cui2 :lrl klrl :order (cof asc)) (when (zerop cui2) (setq cui2 nil)) - (make-instance 'ucoc :cui1 (ensure-integer cui1) :cui2 (parse-cui cui2) :soc soc - :cot cot :cof (ensure-integer cof) :coa coa :pfstr2 kpfstr2))) + (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) :lrl "KLRL") - (make-instance 'ulo :isn isn :fr (ensure-integer fr) :un un :sui (ensure-integer sui) - :sna sna :soui soui))) - -(defgeneric suistr (lo)) -(defmethod suistr ((lo ulo)) - "Return the string for a ulo object" - (find-string-sui (sui lo))) + (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) :lrl kluilrl - :distinct t) - (make-instance 'uterm :lui (ensure-integer lui) :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 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" - (with-umlisp-query (mrcon (sui stt str lrl) srl kcuilui (make-cuilui cui lui) :lrl lrl) + (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 :cuisui (make-cuisui cui sui) :stt stt :str str :lrl (ensure-integer lrl)))) (defun find-ustr-cuisui (cui sui &key (srl *current-srl*)) "Return the single ustr for cuisui" - (with-umlisp-query (mrcon (lui stt str lrl) srl kcuisui (make-cuisui cui sui) :lrl lrl :single t) + (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) - :lui (ensure-integer lui) :stt stt :str str :lrl (ensure-integer lrl)))) + :lui (ensure-integer lui) :stt stt :str str + :lrl (ensure-integer lrl)))) (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) :lrl lrl) + (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*)) @@ -333,7 +414,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (let ((cuisui (ensure-integer kcuisui))) (apply #'find-ustr-cuisui (append - (multiple-value-list (decompose-cuisui cuisui)) (list :srl srl)))))) + (multiple-value-list (decompose-cuisui cuisui)) + (list :srl srl)))))) (defun find-ustr-all (&key (srl *current-srl*)) "Return list of all ustr's" @@ -341,46 +423,61 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (clsql:map-query 'list #'(lambda (cui lui sui stt lrl pfstr) - (make-instance 'ustr :cui (ensure-integer cui) :lui (ensure-integer lui) - :sui (ensure-integer sui) :stt stt :str pfstr - :cuisui (make-cuisui (ensure-integer cui) (ensure-integer sui)) + (make-instance 'ustr :cui (ensure-integer cui) + :lui (ensure-integer lui) :sui (ensure-integer sui) + :stt stt :str pfstr + :cuisui (make-cuisui (ensure-integer cui) + (ensure-integer sui)) :lrl (ensure-integer lrl))) - (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl :distinct t + (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl + :distinct t :order (sui asc)) :database db))) (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*)) - (with-umlisp-query (mrso (sab code srl tty) srl kcuisui (make-cuisui cui sui) :lrl 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*)) - (with-umlisp-query (mrcxt (sab code cxn cxl rnk cxs cui2 hcd rela xc) srl kcuisui - (make-cuisui cui sui) :lrl ksrl) + (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 - :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd :rela rela :xc xc - :rnk (ensure-integer rnk) :cui2 (ensure-integer cui2)))) + :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd + :rela rela :xc xc :rnk (ensure-integer rnk) + :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)))) - (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 (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)))) (when srl - (string-append ls (format nil " and KSRL <= ~d" srl))) + (string-append ls (format nil " and KSRL <= ~D" srl))) (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))))) (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" @@ -394,27 +491,30 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-usab-all () "Find usab for a key" - (with-umlisp-query (mrsab (vcui rcui vsab rsab son sf sver mstart mend imeta rmeta slc - scc srl tfr cfr cxty ttyl atnl lat cenc curver sabin) - nil nil nil) + (with-umlisp-query (mrsab (vcui rcui vsab rsab son sf sver mstart mend imeta + rmeta slc scc srl tfr cfr cxty ttyl atnl lat + cenc curver sabin) nil nil nil) (make-instance 'usab :vcui (ensure-integer vcui) - :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son :sf sf - :sver sver :mstart mstart :mend mend :imeta imeta :rmeta rmeta - :slc slc :scc scc :srl (ensure-integer srl) :tfr (ensure-integer tfr) - :cfr (ensure-integer cfr) :cxty cxty :ttyl ttyl :atnl atnl :lat lat - :cenc cenc :curver curver :sabin sabin))) + :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son + :sf sf :sver sver :mstart mstart :mend mend :imeta imeta + :rmeta rmeta :slc slc :scc scc :srl (ensure-integer srl) + :tfr (ensure-integer tfr) :cfr (ensure-integer cfr) + :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc + :curver curver :sabin sabin))) (defun find-usab-by-key (key-name key) "Find usab for a key" - (with-umlisp-query-eval ('mrsab '(vcui rcui vsab rsab son sf sver mstart mend imeta - rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc - curver sabin) nil key-name key :single t) + (with-umlisp-query-eval ('mrsab '(vcui rcui vsab rsab son sf sver mstart + mend imeta rmeta slc scc srl tfr cfr cxty + ttyl atnl lat cenc curver sabin) + nil key-name key :single t) (make-instance 'usab :vcui (ensure-integer vcui) - :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son :sf sf - :sver sver :mstart mstart :mend mend :imeta imeta :rmeta rmeta - :slc slc :scc scc :srl (ensure-integer srl) :tfr (ensure-integer tfr) - :cfr (ensure-integer cfr) :cxty cxty :ttyl ttyl :atnl atnl :lat lat - :cenc cenc :curver curver :sabin sabin))) + :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son + :sf sf :sver sver :mstart mstart :mend mend :imeta imeta + :rmeta rmeta :slc slc :scc scc :srl (ensure-integer srl) + :tfr (ensure-integer tfr) :cfr (ensure-integer cfr) + :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc + :curver curver :sabin sabin))) (defun find-usab-rsab (rsab) "Find usab for rsab" @@ -431,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)) @@ -458,6 +559,18 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :order (cui asc sui asc)) (find-ustr-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl))) +(defun find-ucon-noneng-word (word &key (srl *current-srl*) (like nil)) + "Return list of ucons that match non-english word" + (with-umlisp-query-eval ('mrxw_noneng '(cui) srl 'wd word :like like + :distinct t :lrl 'klrl :order '(cui asc)) + (find-ucon-cui cui :srl srl))) + +(defun find-ustr-noneng-word (word &key (srl *current-srl*)) + "Return list of ustrs that match non-english word" + (with-umlisp-query (mrxw_noneng (cui sui) srl wd word :lrl klrl + :order (cui asc sui asc)) + (find-ustr-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl))) + ;; Special tables (defun find-usrl-all () @@ -535,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))) @@ -546,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)))) @@ -556,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)))