From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Sun, 6 Jun 2010 17:12:08 +0000 (-0600)
Subject: Merge branch 'master' of ssh://git.b9.com/home/gitpub/umlisp
X-Git-Tag: debian-2007ac.2-6~3
X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=cb84d39847530c3317d03230eb82af671c71ef79;hp=-c

Merge branch 'master' of ssh://git.b9.com/home/gitpub/umlisp
---

cb84d39847530c3317d03230eb82af671c71ef79
diff --combined sql-classes.lisp
index 64cc4b3,912a3fc..87d59bf
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@@ -626,20 -626,20 +626,20 @@@ is OBJNAME from TABLE where WHERE-NAME 
  
  (defun find-uso-cui (cui &key (srl *current-srl*) (english-only nil) limit)
    (ensure-cui-integer cui)
-   (collect-umlisp-query (mrconso (aui sab code srl tty saui sdui scui lat str sui)
+   (collect-umlisp-query (mrconso (aui sab code srl tty saui sdui scui lat str sui ts)
                                   srl cui cui :lrl srl :limit limit
                                   :filter (when english-only "LAT='ENG'"))
       (make-instance 'uso :aui aui :sab sab :code code :srl srl :tty tty
                      :cui cui :sui sui :saui saui :sdui sdui :scui scui
-                     :lat lat :str str)))
+                     :lat lat :str str :ts ts)))
  
  (defun find-uso-aui (aui &key (srl *current-srl*))
    (ensure-sui-integer aui)
    (collect-umlisp-query (mrconso (sab cui sui code srl tty saui sdui scui lat
-                                       str) srl aui aui :lrl srl :single t)
+                                       str ts) srl aui aui :lrl srl :single t)
      (make-instance 'uso :aui aui :cui cui :sab sab :code code :srl srl :tty tty
                     :sui sui :saui saui :sdui sdui :scui scui :lat lat
-                    :str str)))
+                    :str str :ts ts)))
  
  (defun find-uhier-cui (cui &key (srl *current-srl*))
    (ensure-cui-integer cui)
@@@ -911,8 -911,8 +911,8 @@@
                                  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))))