(defun find-uconso-sui (sui &key sab (srl *current-srl*))
"Find uconso for a sui. If set SAB, the without-pfstr is on by default"
(ensure-sui-integer sui)
- (unless (and sui (stringp sab))
+;; (unless (and sui (stringp sab))
+ (unless sui
(return-from find-uconso-sui nil))
(collect-umlisp-query (mrconso (cui lat ts lui stt sui ispref aui saui scui sdui sab tty code str
(defun find-udef-cui (cui &key (srl *current-srl*))
"Return a list of udefs for cui"
(ensure-cui-integer cui)
- (collect-umlisp-query (mrdef (sab def suppress) srl cui cui :lrl "KSRL")
+ (collect-umlisp-query (mrdef (sab def suppress) srl cui cui :lrl "KSRL"
+ :distinct t)
(make-instance 'udef :sab sab :def def :suppress suppress)))
(defun find-udoc-key (key)
(ensure-cui-integer cui)
(ensure-lui-integer lui)
(collect-umlisp-query (mrconso (sui stt str suppress ksuilrl) srl kcuilui
- (make-cuilui cui lui) :lrl ksuilrl)
+ (make-cuilui cui lui) :lrl ksuilrl :distinct t)
(make-instance 'ustr :sui (ensure-integer sui) :cui cui :lui lui
:cuisui (make-cuisui cui sui) :stt stt :str str :suppress suppress
:lrl (ensure-integer ksuilrl))))
(defun find-ustr-cuisui (cuisui &key (srl *current-srl*))
"Return the single ustr for cuisui"
(collect-umlisp-query (mrconso (cui lui sui stt str suppress ksuilrl) srl kcuisui
- cuisui :lrl lsuilrl :single t)
+ cuisui :lrl ksuilrl :single t)
(make-instance 'ustr :sui sui :cui cui :cuisui cuisui
:lui (ensure-integer lui) :stt stt :str str :suppress suppress
:lrl (ensure-integer ksuilrl))))
"Return the list of ustr for sui"
(ensure-sui-integer sui)
(collect-umlisp-query (mrconso (cui lui stt str suppress ksuilrl) srl sui sui
- :lrl ksuilrl)
+ :lrl ksuilrl :distinct t)
(make-instance 'ustr :sui sui :cui cui :stt stt :str str
:cuisui (make-cuisui (ensure-integer cui) sui)
:suppress suppress
only-exact-if-match limit &key extra-lookup-args)
(let ((uobjs '()))
(dolist (word (delimited-string-to-list str #\space))
- (setq uobjs (append uobjs
- (kmrcl:flatten (apply obj-lookup-fun word :srl srl extra-lookup-args)))))
+ (setq uobjs (nconc uobjs
+ (kmrcl:flatten (apply obj-lookup-fun word :srl srl extra-lookup-args)))))
(let ((sorted
(funcall sort-fun str
(delete-duplicates uobjs :test #'= :key key))))
(defun find-ustats-srl (srl)
(collect-umlisp-query (ustats (name count) nil srl srl :order (name asc))
(make-instance 'ustats :name name :hits (ensure-integer count))))
-