X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=blobdiff_plain;f=sql-classes.lisp;fp=sql-classes.lisp;h=78ae763f18e9a88b14c572612df4fc8c36e847b8;hp=b1373f004d8f14140bc9d1e5d10ed746a8e3f54d;hb=7f30522f16a7c528b5a0f0ee493bbb0cb1aef77b;hpb=cd3b91a343663cc9f12fd551e454de552be9ff9d diff --git a/sql-classes.lisp b/sql-classes.lisp index b1373f0..78ae763 100644 --- a/sql-classes.lisp +++ b/sql-classes.lisp @@ -285,7 +285,8 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (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 @@ -555,7 +556,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (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)))) @@ -578,7 +579,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" "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 @@ -1157,4 +1158,3 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS" (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)))) -