X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=5983f7c9cecfc80fccc308be45ac1acc64284a7c;hb=7aadf2bbca30301d2479a21edbcdcb6e12da5cd0;hp=594103fcd95c0d9a7b3303f5119b1f3512854136;hpb=67ee261d341603e293f6b0314d5cd12522fa04c6;p=umlisp.git diff --git a/sql-classes.lisp b/sql-classes.lisp index 594103f..5983f7c 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -35,7 +35,7 @@ "")) (%%lrl (format nil " AND ~:@(~A~)<=" lrl)) (%%where (when where-name - (format nil " where ~:@(~A~)~A" where-name + (format nil " WHERE ~:@(~A~)~A" where-name (if like " like " "")))) (%filter (gensym "FILTER-")) (%single (gensym "SINGLE-")) @@ -55,7 +55,7 @@ (number (concatenate 'string "='" (write-to-string ,where-value) "'")) (null - " is null") + " IS NULL") (t (format nil ,(if like "'%~A%'" "='~A'") ,where-value))))) (if ,%filter (concatenate 'string @@ -65,7 +65,7 @@ ,@(when %%order (list %%order)) (cond ((and ,%single ,%limit) - (error "Can't set single and limit")) + (error "Can't set single (~S) and limit (~S)" ,%single ,%limit)) (,%single " LIMIT 1") (,%limit @@ -78,22 +78,22 @@ (when single (setq limit 1)) (concatenate 'string - (format nil "select ~A~{~:@(~A~)~^,~} from ~:@(~A~)" - (if distinct "distinct " "") fields table) - (if where-name (format nil " where ~:@(~A~)" where-name) "") + (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 "='~D'") - (null " is null") + (null " IS NULL") (t - (if like " like '%~A%""='~A'"))) + (if like " LINK '%~A%""='~A'"))) where-value) "") (if filter (concatenate 'string " AND " filter) nil) - (if srl (format nil " and ~:@(~A~)<=~D" lrl srl) "") - (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "") - (if limit (format nil " limit ~D" limit) ""))) + (if srl (format nil " AND ~:@(~A~)<=~D" lrl srl) "") + (if order (format nil " ORDER BY ~{~:@(~A~) ~(~A~)~^,~}" order) "") + (if limit (format nil " LIMIT ~D" limit) ""))) (defmacro umlisp-query (table fields srl where-name where-value @@ -224,25 +224,41 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (setq ,eui (parse-eui ,eui)) ,eui)) -(defun find-ucon-cui (cui &key (srl *current-srl*)) - "Find ucon for a cui" +(defun make-ucon-cui (cui) + (ensure-cui-integer cui) + (when cui + (make-instance 'ucon :cui cui))) + +(defun find-ucon-cui (cui &key (srl *current-srl*) without-pfstr) + "Find ucon for a cui. If set SAB, the without-pfstr is on by default" (ensure-cui-integer cui) (unless cui (return-from find-ucon-cui nil)) - (or - (collect-umlisp-query (mrconso (kcuilrl str) srl cui cui :single t :filter "KPFENG=1") - (make-instance 'ucon :cui cui :pfstr str - :lrl kcuilrl)) - (collect-umlisp-query (mrconso (kcuilrl str) srl cui cui :single t) - (make-instance 'ucon :cui cui :pfstr str - :lrl kcuilrl)))) - -(defun find-ucon-cui-sans-pfstr (cui &key (srl *current-srl*)) - "Find ucon for a cui" + (if without-pfstr + (collect-umlisp-query (mrconso (kcuilrl) srl cui cui :single t) + (make-instance 'ucon :cui cui :lrl (ensure-integer kcuilrl) + :pfstr nil))) + (or + (collect-umlisp-query (mrconso (kcuilrl str) srl cui cui :single t :filter "KPFENG=1") + (make-instance 'ucon :cui cui :pfstr str + :lrl kcuilrl)) + (collect-umlisp-query (mrconso (kcuilrl str) srl cui cui :single t) + (make-instance 'ucon :cui cui :pfstr str + :lrl kcuilrl)))) + +(defun find-uconso-cui (cui &key (srl *current-srl*)) + "Find ucon for a cui. If set SAB, the without-pfstr is on by default" (ensure-cui-integer cui) - (collect-umlisp-query (mrconso (kcuilrl) srl cui cui :single t) - (make-instance 'ucon :cui cui :lrl (ensure-integer kcuilrl) - :pfstr nil))) + (unless cui (return-from find-uconso-cui nil)) + + (collect-umlisp-query (mrconso (lat ts lui stt sui ispref aui saui scui sdui sab tty code str + srl suppress cvf kpfeng kcuisui kcuilui kcuilrl + kluilrl ksuilrl) srl cui cui) + (make-instance 'uconso :cui cui :lat lat :ts ts :lui lui :stt stt :sui sui :ispref ispref + :aui aui :saui saui :scui scui :sdui sdui :sab sab :tty tty :code code + :str str :srl srl :suppress suppress :cvf cvf :kpfeng kpfeng + :kcuisui kcuisui :kcuilui kcuilui :kcuilrl kcuilrl :kluilrl kluilrl + :ksuilrl ksuilrl))) (defun find-pfstr-cui (cui &key (srl *current-srl*)) "Find preferred string for a cui" @@ -253,7 +269,13 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" str) (collect-umlisp-query (mrconso (str) srl cui cui :distinct t :single t) - str))) + str))) + +(defun find-lrl-cui (cui &key (srl *current-srl*)) + "Find LRL for a cui" + (ensure-cui-integer cui) + (collect-umlisp-query (mrconso (kcuilrl) srl cui cui :distinct t :single t) + (ensure-integer kcuilrl))) (defun find-ucon-lui (lui &key (srl *current-srl*)) "Find list of ucon for lui" @@ -380,15 +402,19 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :distinct t) (make-instance 'usty :tui (ensure-integer tui) :sty sty))) -(defun find-urel-cui (cui &key (srl *current-srl*)) +(defun find-urel-cui (cui &key (srl *current-srl*) filter without-pfstr2) "Return a list of urel for cui" (ensure-cui-integer cui) (collect-umlisp-query (mrrel (aui1 rel stype1 cui2 aui2 stype2 rela rui srui sab sl rg dir suppress cvf) - srl cui1 cui :lrl "KSRL") - (make-instance 'urel :cui1 cui :aui1 (ensure-integer aui1) :stype1 stype1 :rel rel - :cui2 (ensure-integer cui2) :aui2 (ensure-integer aui2) :stype2 stype2 - :rui (ensure-integer rui) :srui srui :rela rela :sab sab :sl sl :rg rg :dir dir - :suppress suppress :cvf cvf :pfstr2 (find-pfstr-cui cui2)))) + srl cui1 cui :lrl "KSRL" :filter filter) + (let ((rel + (make-instance 'urel :cui1 cui :aui1 (ensure-integer aui1) :stype1 stype1 :rel rel + :cui2 (ensure-integer cui2) :aui2 (ensure-integer aui2) :stype2 stype2 + :rui (ensure-integer rui) :srui srui :rela rela :sab sab :sl sl :rg rg :dir dir + :suppress suppress :cvf cvf))) + (unless without-pfstr2 + (setf (slot-value rel 'pfstr2) (find-pfstr-cui cui2))) + rel))) (defun find-urel-rui (rui &key (srl *current-srl*)) "Return the urel for a rui" @@ -572,17 +598,6 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :sui sui :saui saui :sdui sdui :scui scui :lat lat :str str))) -(defun find-ucxt-cuisui (cui sui &key (srl *current-srl*)) - (ensure-cui-integer cui) - (ensure-sui-integer sui) - (collect-umlisp-query (mrcxt (sab rank code cxn cxl cxs cui2 hcd rela xc) - srl kcuisui (make-cuisui cui sui) :lrl ksrl) - (make-instance 'ucxt :sab sab :code code - :rank rank - :cxn (ensure-integer cxn) :cxl cxl :cxs cxs :hcd hcd - :rela rela :xc xc - :cui2 (ensure-integer cui2)))) - (defun find-uhier-cui (cui &key (srl *current-srl*)) (ensure-cui-integer cui) (collect-umlisp-query (mrhier (aui cxn paui sab rela ptr hcd cvf) @@ -604,7 +619,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (ensure-cui-integer cui) (ensure-lui-integer lui) (ensure-sui-integer sui) - (let ((ls "select CODE,ATN,SAB,ATV from MRSAT where ")) + (let ((ls "SELECT CODE,ATN,SAB,ATV FROM MRSAT WHERE ")) (cond (sui (string-append ls "KCUISUI='" (integer-string (make-cuisui cui sui) 14) @@ -713,6 +728,43 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" :lrl 'klrl :order '(cui asc)) (find-ucon-cui cui :srl srl))) +(defun find-ucon-word-sab (word &key sab (srl *current-srl*) (like nil)) + "Return list of ustr that match word in matching SAB. Optionally, use SQL's LIKE syntax" + (let ((query (format nil "SELECT c.cui FROM MRCONSO c,MRXW_ENG x WHERE x.WD ~A '~A' AND x.cui=c.cui AND ~A ~A" + (if like "LIKE" "=") + (clsql-sys::sql-escape-quotes word) + (etypecase sab + (string + (format nil " c.sab='~A'" (clsql-sys::sql-escape-quotes sab))) + (cons + (format nil " c.sab IN (~{'~A'~^,~})" + (mapcar 'clsql-sys::sql-escape-quotes sab))) + (null + (error "SAB missing"))) + (if srl (format nil "AND KCUILRL <= ~A" srl) "")))) + (loop for tuple in (mutex-sql-query query) + collect (make-instance 'ucon :cui (first tuple))))) + +(defun find-ustr-word-sab (word &key sab (srl *current-srl*) (like nil)) + "Return list of ustr that match word in matching SAB. Optionally, use SQL's LIKE syntax" + (let ((query (format nil "SELECT c.sui,c.cui,c.lui,c.str,c.lrl,c.stt,c.suppress,c.cuisui FROM MRCONSO c,MRXW_ENG x WHERE x.WD ~A '~A' AND x.cui=c.cui AND x.lui=c.lui AND x.sui=c.sui AND ~A ~A" + (if like "LIKE" "=") + (clsql-sys::sql-escape-quotes word) + (typecase sab + (string + (format nil " c.sab='" (clsql-sys::sql-escape-quotes sab))) + (cons + (format nil " c.sab IN (~('~A'~^,~))" + (mapcar 'clsql-sys::sql-escape-quotes sab))) + (t + (error "SAB missing"))) + (if srl (format nil "AND KCUILRL <= ~D" srl) "")))) + (loop for tuple in (mutex-sql-query query) + collect (destructuring-bind (sui cui lui str lrl stt suppress cuisui) tuple + (make-instance 'ustr :sui sui :cui cui :lui lui :str str :lrl lrl + :stt stt :suppress suppress :cuisui cuisui))))) + + (defun find-ucon-normalized-word (word &key (srl *current-srl*) (like nil)) "Return list of ucons that match word, optionally use SQL's LIKE syntax" (collect-umlisp-query-eval ('mrxnw_eng '(cui) srl 'nwd word :like like :distinct t @@ -782,10 +834,10 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" ;;; Multiword lookup and score functions (defun find-uobj-multiword (str obj-lookup-fun sort-fun key srl - only-exact-if-match limit) + only-exact-if-match limit &key extra-lookup-args) (let ((uobjs '())) (dolist (word (delimited-string-to-list str #\space)) - (setq uobjs (append uobjs (funcall obj-lookup-fun word :srl srl)))) + (setq uobjs (append uobjs (apply obj-lookup-fun word :srl srl extra-lookup-args)))) (let ((sorted (funcall sort-fun str (delete-duplicates uobjs :test #'= :key key)))) @@ -804,9 +856,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-ucon-multiword (str &key (srl *current-srl*) (only-exact-if-match t) - limit) - (find-uobj-multiword str #'find-ucon-word #'sort-score-pfstr-str - #'cui srl only-exact-if-match limit)) + limit + sab) + (if sab + (find-uobj-multiword str #'find-ucon-word-sab #'sort-score-pfstr-str + #'cui srl only-exact-if-match limit + :extra-lookup-args (list :sab sab)) + (find-uobj-multiword str #'find-ucon-word #'sort-score-pfstr-str + #'cui srl only-exact-if-match limit))) (defun find-uterm-multiword (str &key (srl *current-srl*) (only-exact-if-match t) @@ -816,9 +873,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (defun find-ustr-multiword (str &key (srl *current-srl*) (only-exact-if-match t) - limit) - (find-uobj-multiword str #'find-ustr-word #'sort-score-ustr-str - #'sui srl only-exact-if-match limit)) + limit + sab) + (if sab + (find-uobj-multiword str #'find-ustr-word-sab #'sort-score-ustr-str + #'sui srl only-exact-if-match limit + :extra-lookup-args (list :sab sab)) + (find-uobj-multiword str #'find-ustr-word #'sort-score-ustr-str + #'sui srl only-exact-if-match limit))) (defun sort-score-pfstr-str (str uobjs) "Return list of sorted and scored ucons. Score by match of str to ucon-pfstr" @@ -1019,25 +1081,3 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (collect-umlisp-query (ustats (name count) nil srl srl :order (name asc)) (make-instance 'ustats :name name :hits (ensure-integer count)))) - - -(defun find-bsab-sab (sab) - (collect-umlisp-query (bonus_sab (name count) nil sab sab :single t) - (make-instance 'bsab :sab sab :name name :hits (ensure-integer count)))) - -(defun find-bsab-all () - (collect-umlisp-query (bonus_sab (sab name count) nil nil nil :order (sab asc)) - (make-instance 'bsab :sab sab :name name :hits (ensure-integer count)))) - -(defun find-btty-tty (tty) - (collect-umlisp-query (bonus_tty (name count) nil tty tty :single t) - (make-instance 'btty :tty tty :name name :hits (ensure-integer count)))) - -(defun find-btty-all () - (collect-umlisp-query (bonus_tty (tty name count) nil nil nil :order (tty asc)) - (make-instance 'btty :tty tty :name name :hits (ensure-integer count)))) - -(defun find-brel-rel (rel) - (collect-umlisp-query (bonus_rel (sab sl rel rela count) nil rel rel) - (make-instance 'brel :sab sab :sl sl :rel rel :rela rela - :hits (ensure-integer count))))