X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=sql-classes.lisp;h=a7b080414cfebc599c8e3e77bc637d888646e506;hb=188873f068b0c53febe4ee0ededbc755fce4869d;hp=2fc138bbe8aa6dcfcfe896e9b59905128dd69d97;hpb=5a80d916816131a1d56a60790cd1e4b5e9c88810;p=umlisp.git

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 2fc138b..a7b0804 100644
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -2,22 +2,21 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          sql-classes.lisp
-;;;; Purpose:       Routines for reading UMLS objects from SQL database
-;;;; Programmer:    Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:     sql-classes.lisp
+;;;; Purpose:  Routines for reading UMLS objects from SQL database
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.4 2002/10/14 09:25:20 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2003 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
 ;;;; *************************************************************************
 
-(in-package :umlisp)
-(declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3)))
+(in-package #:umlisp)
 
 
 (defvar *current-srl* nil)
@@ -26,633 +25,643 @@
 (defun current-srl! (srl)
   (setq *current-srl* srl))
 
-
-;;; Accessors (read on demand)
-
-;; defines a slot-unbound method for class and slot-name, fills
-;; the slot by calling reader function with the slot values of
-;; the instance's reader-keys
-(defmacro def-lazy-reader (class slot-name reader &rest reader-keys)
-  (let* ((the-slot-name (gensym))
-	 (the-class (gensym))
-	 (the-instance (gensym))
-	 (keys '()))
-    (dolist (key reader-keys)
-      (push (list 'slot-value the-instance (list 'quote key)) keys))
-    (setq keys (nreverse keys))
-    `(defmethod slot-unbound (,the-class (,the-instance ,class)
-					 (,the-slot-name (eql ',slot-name)))
-       (declare (ignore ,the-class))
-       (setf (slot-value ,the-instance ,the-slot-name)
-	   (,reader ,@keys)))))
-
-(def-lazy-reader ucon s#term find-uterm-cui cui)
-(def-lazy-reader ucon s#def find-udef-cui cui)
-(def-lazy-reader ucon s#sty find-usty-cui cui)
-(def-lazy-reader ucon s#rel find-urel-cui cui)
-(def-lazy-reader ucon s#coc find-ucoc-cui cui)
-(def-lazy-reader ucon s#lo find-ulo-cui cui)
-(def-lazy-reader ucon s#atx find-uatx-cui cui)
-(def-lazy-reader ucon s#sat find-usat-ui cui)
-
-;; For uterms
-(def-lazy-reader uterm s#str find-ustr-cuilui cui lui)
-(def-lazy-reader uterm s#sat find-usat-ui cui lui)
-
-;; For ustrs
-(def-lazy-reader ustr s#sat find-usat-ui cui lui sui)
-(def-lazy-reader ustr s#cxt find-ucxt-cuisui cui sui)
-(def-lazy-reader ustr s#so find-uso-cuisui cui sui)
-
-;;; Object lookups
-
-;;; Lookup functions for uterms,ustr in ucons
-
-(defun find-uterm-in-ucon (ucon lui)
-  (find lui (s#term ucon) :key #'lui :test 'equal))
-
-(defun find-ustr-in-uterm (uterm sui)
-  (find sui (s#str uterm) :key #'sui :test 'equal))
-
-(defun find-ustr-in-ucon (ucon sui)
-  (let ((found-ustr nil))
-    (dolist (uterm (s#term ucon))
-      (unless found-ustr
-	(dolist (ustr (s#str uterm))
-	  (unless found-ustr
-	    (when (string-equal sui (sui ustr))
-	      (setq found-ustr ustr))))))
-    found-ustr))
-
+(defmacro query-string (table fields &optional srl where-name where-value
+			&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)
+		      ""))
+	 (%%lrl (format nil " and ~:@(~A~)<=" lrl))
+	 (%%where (when where-name
+		    (format nil " where ~:@(~A~)~A" where-name
+			  (if like " like " "")))))
+    `(concatenate
+      'string
+      ,%%fields
+      ,@(when %%where (list %%where))
+      ,@(when %%where
+	  `((typecase ,where-value
+	      #+ignore
+	      (fixnum
+	       (concatenate 'string "='" (prefixed-fixnum-string ,where-value #\0 10) "'"))
+	      (number
+	       (concatenate 'string "='" (write-to-string ,where-value) "'"))
+	      (null
+	       " is null")
+	      (t
+	       (format nil ,(if like "'%~A%'" "='~A'") ,where-value)))))
+      (if ,srl (concatenate 'string ,%%lrl (write-to-string ,srl)) "")
+      ,@(when %%order (list %%order))
+      ,@(when single (list " limit 1")))))
+
+(defun query-string-eval (table fields &optional srl where-name where-value
+			  &key (lrl "KCUILRL") single distinct order like)
+  (concatenate
+   '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 "='~D'")
+		 (null " is null")
+		 (t
+		  (if like " like '%~A%""='~A'")))
+	       where-value)
+       "")
+   (if srl (format nil " and ~:@(~A~)<=~D" lrl srl) "")
+   (if order (format nil " order by ~{~:@(~A~) ~(~A~)~^,~}" order) "")
+   (if single " limit 1" "")))
+
+
+(defmacro umlisp-query (table fields srl where-name where-value
+		     &key (lrl "KCUILRL") single distinct order like
+			(query-cmd 'mutex-sql-query))
+  "Query the UMLisp database. Return a list of umlisp objects whose name
+is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
+  `(,query-cmd
+    (query-string ,table ,fields ,srl ,where-name ,where-value 
+     :lrl ,lrl :single ,single :distinct ,distinct :order ,order :like ,like)))
+
+(defmacro umlisp-query-eval (table fields srl where-name where-value
+		     &key (lrl "KCUILRL") single distinct order like)
+  "Query the UMLisp database. Return a list of umlisp objects whose name
+is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
+  `(mutex-sql-query
+    (query-string-eval ,table ,fields ,srl ,where-name ,where-value 
+     :lrl ,lrl :single ,single :distinct ,distinct :order ,order :like ,like)))
+
+;; only WHERE-VALUE and SRL are evaluated
+(defmacro collect-umlisp-query ((table fields srl where-name where-value
+				    &key (lrl "KCUILRL") distinct single
+				    order like (query-cmd 'mutex-sql-query))
+				&body body)
+  (let ((value (gensym))
+	(r (gensym))) 
+    (if single
+	`(let* ((,value ,where-value)
+		(tuple (car (umlisp-query ,table ,fields ,srl ,where-name ,value
+					  :lrl ,lrl :single ,single
+					  :distinct ,distinct :order ,order
+					  :like ,like
+					  :query-cmd ,query-cmd))))
+	  ,@(unless where-name `((declare (ignore ,value))))
+	  (when tuple
+		(destructuring-bind ,fields tuple
+		  ,@body)))
+	`(let ((,value ,where-value))
+	   ,@(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 collect-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)
+		(tuple (car (umlisp-query-eval ,table ,fields ,srl ,where-name ,value
+					       :lrl ,lrl :single ,single
+					       :distinct ,distinct :order ,order
+					       :like ,like))))
+	  (when tuple
+	    (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"
-  (if (stringp cui)
-      (setq cui (parse-cui cui)))
-  (if cui
-      (let ((ls (format nil "select KPFSTR,KCUILRL from MRCON where CUI=~d"
-			cui)))
-	(if srl
-	    (string-append ls (format nil " and KCUILRL <= ~d limit 1" srl))
-	  (string-append ls " limit 1"))
-	(kmrcl:awhen (car (mutex-sql-query ls))
-		  (make-instance 'ucon :cui cui :pfstr (car kmrcl::it) 
-				 :lrl (ensure-integer (cadr kmrcl::it)))))
-    nil))
+  (ensure-cui-integer cui)
+  (collect-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"
+  (ensure-cui-integer cui)
+  (collect-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"
+  (ensure-cui-integer cui)
+  (collect-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"
-  (if (stringp lui)
-      (setq lui (parse-lui lui)))
-  (if lui
-      (let ((ucons '())
-	    (ls (format nil "select distinct CUI,KPFSTR,KCUILRL from MRCON where LUI=~d" lui)))
-	(if srl
-	    (string-append ls (format nil " and KCUILRL <= ~d" srl)))
-	(dolist (tuple (mutex-sql-query ls))
-	  (push (make-instance 'ucon :cui (ensure-integer (nth 0 tuple))
-			       :pfstr (nth 1 tuple)
-			       :lrl (ensure-integer (nth 2 tuple)))
-		ucons))
-	(nreverse ucons))
-    nil))
+  (ensure-lui-integer lui)
+  (collect-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"
-  (if (stringp sui)
-      (setq sui (parse-sui sui)))
-  (if sui
-      (let ((ucons '())
-	    (ls (format nil "select distinct CUI,KPFSTR,KCUILRL from MRCON where SUI=~d" sui)))
-	(when srl
-	    (string-append ls (format nil " and KCUILRL <= ~d" srl)))
-	(let ((tuples (mutex-sql-query ls)))
-	  (dolist (tuple tuples)
-	    (push (make-instance 'ucon :cui (ensure-integer (nth 0 tuple)) 
-				 :pfstr (nth 1 tuple)
-				 :lrl (ensure-integer (nth 2 tuple)))
-		  ucons)))
-    (nreverse ucons))
-  nil))
+  (ensure-sui-integer sui)
+  (collect-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"
-  (if (stringp cui)
-      (setq cui (parse-cui cui)))
-  (if (stringp sui)
-      (setq sui (parse-sui sui)))
-  (if (and cui sui)
-      (let ((ls (format nil "select distinct CUI,KPFSTR,KCUILRL from MRCON where KCUISUI=~d"
-			(make-cuisui cui sui))))
-	(when srl
-	    (string-append ls (format nil " and KCUILRL <= ~d" srl)))
-	(kmrcl:aif (car (mutex-sql-query ls))
-	     (make-instance 'ucon :cui (ensure-integer (nth 0 kmrcl::it)) 
-			    :pfstr (nth 1 kmrcl::it)
-			    :lrl (ensure-integer (nth 2 kmrcl::it)))
-	     nil))
-    nil))
+  (ensure-cui-integer cui)
+  (ensure-sui-integer sui)
+  (when (and cui sui)
+    (collect-umlisp-query (mrcon (kpfstr kcuilrl) srl kcuisui
+			      (make-cuisui cui sui))
+      (make-instance 'ucon :cui cui
+		     :pfstr kpfstr
+		     :lrl (ensure-integer kcuilrl)))))
 
 (defun find-ucon-str (str &key (srl *current-srl*))
   "Find ucon that are exact match for str"
-  (if str
-      (let ((ucons '())
-	    (ls (format nil "select distinct CUI,KPFSTR,KCUILRL from MRCON where STR='~a'" str)))
-	(when srl
-	    (string-append ls " and KCUILRL <= ~d" srl))
-	(dolist (tuple (mutex-sql-query ls))
-	  (push (make-instance 'ucon :cui (ensure-integer (nth 0 tuple)) 
-			       :pfstr (nth 1 tuple)
-			       :lrl (ensure-integer (nth 2 tuple))) ucons))
-	(nreverse ucons))
-    nil))
+  (collect-umlisp-query (mrcon (cui kpfstr kcuilrl) srl str str :distinct t)
+    (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr
+		   :lrl (ensure-integer kcuilrl))))
 
 (defun find-ucon-all (&key (srl *current-srl*))
   "Return list of all ucon's"
-  (let ((ls "select distinct CUI,KPFSTR,KCUILRL from MRCON"))
-    (when srl
-      (string-append ls (format nil " where KCUILRL <= ~d" srl)))
-    (string-append ls " order by CUI asc")
-    (with-sql-connection (db)
-      (clsql:map-query 
-       'list
-       #'(lambda (cui pfstr cuilrl)
-	   (make-instance 'ucon :cui (ensure-integer cui)
-			  :pfstr pfstr
-			  :lrl (ensure-integer cuilrl)))
-       ls
-       :database db))))
-
+  (with-sql-connection (db)
+    (clsql:map-query 
+     'list
+     #'(lambda (cui pfstr cuilrl)
+	 (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)
+     :database db)))
+
+(defun find-ucon-all2 (&key (srl *current-srl*))
+  "Return list of all ucon's"
+  (collect-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 find-cui-ucon-all (&key (srl *current-srl*))
+  "Return list of CUIs for all ucons"
+  (collect-umlisp-query (mrcon (cui) srl nil nil :order (cui asc)
+			       :distinct t)
+			cui))
+
+(defun map-ucon-all (fn &key (srl *current-srl*))
+  "Map a function over all ucon's"
+  (with-sql-connection (db)
+    (clsql:map-query 
+     nil
+     #'(lambda (cui pfstr cuilrl)
+	 (funcall fn
+		  (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)
+     :database db)))
 
 
 (defun find-udef-cui (cui &key (srl *current-srl*))
   "Return a list of udefs for cui"
-  (let ((udefs '())
-	(ls (format nil "select SAB,DEF from MRDEF where CUI=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'udef :sab (car tuple) :def (cadr tuple)) udefs))
-    (nreverse udefs)))
+  (ensure-cui-integer cui)
+  (collect-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"
-  (let ((ustys '())
-	(ls (format nil "select TUI,STY from MRSTY where CUI=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'usty :tui (ensure-integer (car tuple)) :sty (cadr tuple)) ustys))
-    ustys))
+  (ensure-cui-integer cui)
+  (collect-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"
-  (let ((ustys '())
-	(ls (format nil "select distinct TUI,STY from MRSTY where STY like '%~a%'" word)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'usty :tui (ensure-integer (car tuple)) :sty (cadr tuple)) ustys))
-    ustys))
+  (collect-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"
-  (let ((urels '())
-	(ls (format nil "select REL,CUI2,RELA,SAB,SL,MG,KPFSTR2 from MRREL where CUI1=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'urel 
-	      :cui1 cui
-	      :rel (nth 0 tuple) 
-	      :cui2 (ensure-integer (nth 1 tuple))
-	      :rela (nth 2 tuple)
-	      :sab (nth 3 tuple)
-	      :sl (nth 4 tuple)
-	      :mg (nth 5 tuple)
-	      :pfstr2 (nth 6 tuple))
-	    urels))
-    (nreverse urels)))
+  (ensure-cui-integer cui)
+  (collect-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-cui2-urel-cui (cui &key (srl *current-srl*))
+  "Return a list of urel for cui"
+  (ensure-cui-integer cui)
+  (collect-umlisp-query (mrrel (cui2) srl cui1
+			       cui :lrl "KSRL")
+			cui2))
 
 (defun find-urel-cui2 (cui2 &key (srl *current-srl*))
   "Return a list of urel for cui2"
-  (let ((urels '())
-	(ls (format nil "select REL,CUI1,RELA,SAB,SL,MG,KPFSTR2 from MRREL where CUI2=~d" cui2)))
-    (when srl
-	(string-append ls (format nil " and SRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'urel 
-	      :cui2 cui2
-	      :rel (nth 0 tuple) 
-	      :cui1 (ensure-integer (nth 1 tuple))
-	      :rela (nth 2 tuple)
-	      :sab (nth 3 tuple)
-	      :sl (nth 4 tuple)
-	      :mg (nth 5 tuple)
-	      :pfstr2 (nth 6 tuple))
-	    urels))
-    (nreverse urels)))
+  (ensure-cui-integer cui2)
+  (collect-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"
-  (let ((ucocs '())
-	(ls (format nil "select CUI2,SOC,COT,COF,COA,KPFSTR2 from MRCOC where CUI1=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by COF asc")
-    (dolist (tuple (mutex-sql-query ls))
-      (let ((cui2 (ensure-integer (nth 0 tuple))))
-	(when (zerop cui2)
-	  (setq cui2 nil))
-	(push (make-instance 'ucoc :cui1 cui
-			     :cui2 cui2
-			     :soc (nth 1 tuple)
-			     :cot (nth 2 tuple)
-			     :cof (ensure-integer (nth 3 tuple))
-			     :coa (nth 4 tuple)
-			     :pfstr2 (nth 5 tuple))
-	      ucocs)))
-    ucocs)) ;; akready ordered by SQL select
+  (ensure-cui-integer cui)
+  (collect-umlisp-query (mrcoc (cui2 soc cot cof coa kpfstr2) srl cui1
+			    cui :lrl klrl :order (cof asc))
+    (setq cui2 (ensure-integer cui2))
+    (when (eql 0 cui2) (setq cui2 nil))
+    (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"
-  (let ((ucocs '())
-	(ls (format nil "select CUI1,SOC,COT,COF,COA,KPFSTR2 from MRCOC where CUI2=~d" cui2)))
-    (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (string-append ls " order by COF asc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'ucoc :cui1 (ensure-integer (nth 0 tuple))
-			   :cui2 cui2
-			   :soc (nth 1 tuple)
-			   :cot (nth 2 tuple)
-			   :cof (ensure-integer (nth 3 tuple))
-			   :coa (nth 4 tuple)
-			   :pfstr2 (nth 5 tuple))
-	    ucocs))
-    ucocs)) ;; already ordered by SQL select
+  (ensure-cui-integer cui2)
+  (collect-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 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"
-  (let ((ulos '())
-	(ls (format nil "select ISN,FR,UN,SUI,SNA,SOUI from MRLO where CUI=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'ulo :isn (nth 0 tuple) 
-			   :fr (ensure-integer (nth 1 tuple))
-			   :un (nth 2 tuple)
-			   :sui (ensure-integer (nth 3 tuple))
-			   :sna (nth 4 tuple)
-			   :soui (nth 5 tuple))
-	    ulos))
-    (nreverse ulos)))
-
-(defmethod suistr ((lo ulo))
-  "Return the string for a ulo object"
-  (find-string-sui (sui lo)))
+  (ensure-cui-integer cui)
+  (collect-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"
-  (let ((uatxs '())
-	(ls (format nil "select SAB,REL,ATX from MRATX where CUI=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'uatx :sab (nth 0 tuple) 
-			   :rel (nth 1 tuple)
-			   :atx (nth 2 tuple))
-	    uatxs))
-    (nreverse uatxs)))
+  (ensure-cui-integer cui)
+  (collect-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"
-  (let ((uterms '())
-	(ls (format nil "select distinct LUI,LAT,TS,KLUILRL from MRCON where CUI=~d" cui)))
-    (when srl
-	(string-append ls (format nil " and KLUILRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'uterm :lui (ensure-integer (nth 0 tuple))
-			   :cui cui
-			   :lat (nth 1 tuple)
-			   :ts (nth 2 tuple)
-			   :lrl (ensure-integer (nth 3 tuple)))
-	uterms))
-    (nreverse uterms)))
+  (ensure-cui-integer cui)
+  (collect-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"
-  (if (stringp lui)
-      (setq lui (parse-lui lui)))
-  (let ((uterms '())
-	(ls (format nil "select distinct CUI,LAT,TS,KLUILRL from MRCON where LUI=~d" lui)))
-    (when srl
-	(string-append ls (format nil " and KLUILRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'uterm :cui (ensure-integer (nth 0 tuple))
-			   :lui lui
-			   :lat (nth 1 tuple)
-			   :ts (nth 2 tuple)
-			   :lrl (ensure-integer (nth 3 tuple)))
-	    uterms))
-    (nreverse uterms)))
+  (ensure-lui-integer lui)
+  (collect-umlisp-query (mrcon (cui lat ts kluilrl) srl lui lui 
+			     :lrl kluilrl :distinct t)
+    (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"
-  (let ((ls (format nil "select LAT,TS,KLUILRL from MRCON where KCUILUI=~d limit 1" (make-cuilui cui lui))))
-    (when srl
-	(string-append ls (format nil " and KLUILRL <= ~d" srl)))
-    (kmrcl:aif (car (mutex-sql-query ls))
-	 (make-instance 'uterm :cui cui
-			:lui lui
-			:lat (nth 0 kmrcl::it)
-		       :ts (nth 1 kmrcl::it)
-		       :lrl (ensure-integer (nth 2 kmrcl::it)))
-	 nil)))
+  (ensure-cui-integer cui)
+  (ensure-lui-integer lui)
+  (collect-umlisp-query (mrcon (lat ts kluilrl) srl kcuilui
+			     (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"
-  (declare (fixnum cui lui))
-  (let ((ustrs '())
-	(ls (format nil "select SUI,STT,STR,LRL from MRCON where KCUILUI=~d" (make-cuilui cui lui))))
-    (when srl
-	(string-append ls (format nil " and LRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (let* ((sui (ensure-integer (car tuple)))
-	     (ustr (make-instance 'ustr :sui sui
-				  :cui cui
-				  :cuisui (make-cuisui cui sui)
-				  :lui lui
-				  :stt (nth 1 tuple)
-				  :str (nth 2 tuple)
-				  :lrl (ensure-integer (nth 3 tuple)))))
-	(push ustr ustrs)))
-    (nreverse ustrs)))
+  (ensure-cui-integer cui)
+  (ensure-lui-integer lui)
+  (collect-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"
-  (let ((ls (format nil "select LUI,STT,STR,LRL from MRCON where KCUISUI=~d"
-		    (make-cuisui cui sui))))
-    (when srl
-	(string-append ls (format nil " and LRL <= ~d" srl)))
-    (kmrcl:aif (car (mutex-sql-query ls))
-	 (make-instance 'ustr :sui sui 
-			:cui cui
-			:cuisui (make-cuisui cui sui)
-			:lui (ensure-integer (nth 0 kmrcl::it))
-			:stt (nth 1 kmrcl::it)
-			:str (nth 2 kmrcl::it)
-			:lrl (ensure-integer (nth 3 kmrcl::it)))
-	 nil)))
+  (ensure-cui-integer cui)
+  (ensure-sui-integer sui)
+  (collect-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))))
 
 (defun find-ustr-sui (sui &key (srl *current-srl*))
   "Return the list of ustr for sui"
-  (if (stringp sui)
-      (setq sui (parse-sui sui)))
-  (let ((ustrs '())
-	(ls (format nil "select CUI,LUI,STT,STR,LRL from MRCON where SUI=~d" sui)))
-    (when srl
-	(string-append ls (format nil " and LRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (let ((cui (ensure-integer (car tuple))))
-	(push (make-instance 'ustr :sui sui 
-			     :cui cui
-			     :cuisui (make-cuisui cui sui)
-			     :lui (ensure-integer (nth 1 tuple))
-			     :stt (nth 2 tuple)
-			     :str (nth 3 tuple)
-			     :lrl (ensure-integer (nth 4 tuple)))
-	ustrs)))
-    (nreverse ustrs)))
+  (ensure-sui-integer sui)
+  (collect-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) sui)
+		   :lui (ensure-integer lui) :lrl (ensure-integer lrl))))
       
 (defun find-ustr-sab (sab &key (srl *current-srl*))
   "Return the list of ustr for sab"
-  (let ((ustrs '())
-	(ls (format nil "select KCUISUI from MRSO where SAB='~a'" sab)))
-    (when srl
-	(string-append ls (format nil " and SRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (let ((cuisui (ensure-integer (car tuple))))
-	(push (apply #'find-ustr-cuisui 
-		     (append
-		      (multiple-value-list (decompose-cuisui cuisui))
-		      (list :srl srl)))
-	      ustrs)))
-    (nreverse ustrs)))
+  (collect-umlisp-query (mrso (kcuisui) srl sab sab :lrl srl)
+    (let ((cuisui (ensure-integer kcuisui)))
+      (apply #'find-ustr-cuisui 
+	     (append
+	      (multiple-value-list (decompose-cuisui cuisui))
+	      (list :srl srl))))))
 
 (defun find-ustr-all (&key (srl *current-srl*))
   "Return list of all ustr's"
-  (let ((ls "select distinct CUI,LUI,SUI,STT,LRL,KPFSTR from MRCON"))
-    (when srl
-      (string-append ls (format nil " where LRL <= ~d" srl)))
-    (string-append ls " order by SUI asc")
     (with-sql-connection (db)
       (clsql:map-query 
        'list
        #'(lambda (cui lui sui stt lrl pfstr)
-	   (setq cui (ensure-integer cui))
-	   (setq lui (ensure-integer lui))
-	   (setq sui (ensure-integer sui))	
-	   (setq lrl (ensure-integer lrl))
-	   (make-instance 'ustr :cui cui
-			  :lui lui
-			  :sui sui
-			  :cuisui (make-cuisui cui sui)
-			  :stt stt
-			  :lrl lrl
-			  :str pfstr))
-       ls
-       :database db))))
+	   (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
+		     :order (sui asc))
+       :database db)))
 
 (defun find-string-sui (sui &key (srl *current-srl*))
   "Return the string associated with sui"
-  (let ((ls (format nil "select STR from MRCON where SUI=~d" sui)))
-    (when srl
-      (string-append ls (format nil " and LRL <= ~d" srl)))
-    (string-append ls " limit 1")
-    (caar (mutex-sql-query ls))))
+  (ensure-sui-integer sui)
+  (collect-umlisp-query (mrcon (str) srl sui sui :lrl lrl :single t)
+    str))
 
 (defun find-uso-cuisui (cui sui &key (srl *current-srl*))
-  (declare (fixnum cui sui))
-  (let ((usos '())
-	(ls (format nil "select SAB,CODE,SRL,TTY from MRSO where KCUISUI=~d"
-		    (make-cuisui cui sui))))
-    (when srl
-	(string-append ls (format nil " and SRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'uso :sab (nth 0 tuple) :code (nth 1 tuple) 
-			   :srl (nth 2 tuple) :tty (nth 3 tuple))
-	    usos))
-    (nreverse usos)))
+  (ensure-sui-integer sui)
+  (ensure-cui-integer cui)
+  (collect-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*))
-  (declare (fixnum cui sui))
-  (let ((ucxts '())
-	(ls (format nil "select SAB,CODE,CXN,CXL,RNK,CXS,CUI2,HCD,RELA,XC from MRCXT where KCUISUI=~d" 
-		    (make-cuisui cui sui))))
-    (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (dolist (tuple (mutex-sql-query ls))
-      (push (make-instance 'ucxt :sab (nth 0 tuple) 
-			   :code (nth 1 tuple) 
-			   :cxn (ensure-integer (nth 2 tuple))
-			   :cxl (nth 3 tuple)
-			   :rnk (ensure-integer (nth 4 tuple))
-			   :cxs (nth 5 tuple)
-			   :cui2 (ensure-integer (nth 6 tuple))
-			   :hcd (nth 7 tuple)
-			   :rela (nth 8 tuple)
-			   :xc (nth 9 tuple))
-	    ucxts))
-    (nreverse ucxts)))
+  (ensure-cui-integer cui)
+  (ensure-sui-integer sui)
+  (collect-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))))
 
 (defun find-usat-ui (cui &optional (lui nil) (sui nil) &key (srl *current-srl*))
-  (let ((ls (format nil "select CODE,ATN,SAB,ATV from MRSAT where ")))
+  (ensure-cui-integer cui)
+  (ensure-lui-integer lui)
+  (ensure-sui-integer sui)
+  (let ((ls "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 "KCUISUI='"
+			  (integer-string (make-cuisui cui sui) 14)
+			  "'"))
+      (lui (string-append ls "KCUILUI='"
+			  (integer-string (make-cuilui cui lui) 14)
+			  "' and sui='0'"))
+      (t (string-append ls "cui='" (prefixed-fixnum-string cui nil 7)
+			"' and lui='0' and sui='0'")))
     (when srl
-	(string-append ls (format nil " and KSRL <= ~d" srl)))
-    (let ((usats '()))
-      (dolist (tuple (mutex-sql-query ls))
-	(push (make-instance 'usat :code (nth 0 tuple)
-			     :atn (nth 1 tuple)
-			     :sab (nth 2 tuple)
-			     :atv (nth 3 tuple))
-	      usats))
-      (nreverse usats))))
-
-
-(defun find-pfstr-cui (cui)
-  (caar (mutex-sql-query (format nil "select KPFSTR from MRCON where CUI=~d limit 1" cui))))
+      (string-append ls " and KSRL<=" (prefixed-fixnum-string srl nil 3)))
+    (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"
-  (setq tui (parse-tui tui)) 
-    (kmrcl:aif (car (mutex-sql-query 
-	       (format nil "select STY from MRSTY where TUI=~d limit 1" tui)))
-	 (make-instance 'usty :tui tui :sty (nth 0 kmrcl::it))
-	 nil))
+  (ensure-tui-integer tui)
+  (collect-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"
-  (kmrcl:aif (car (mutex-sql-query 
-		(format nil "select TUI from MRSTY where STY='~a' limit 1" sty)))
-	  (make-instance 'usty :tui (ensure-integer (nth 0 kmrcl::it)) :sty sty)
-	  nil))
+  (collect-umlisp-query (mrsty (tui) nil sty sty :single t)
+    (make-instance 'usty :tui (ensure-integer tui) :sty sty)))
 
 (defun find-usty-all ()
   "Return list of usty's for all semantic types"
-  (let ((ustys '()))
-    (dolist (tuple (mutex-sql-query "select distinct TUI from MRSTY"))
-      (push (find-usty-tui (nth 0 tuple)) ustys))
-    (nreverse ustys)))
-
+  (collect-umlisp-query (mrsty (tui) nil nil nil :distinct t)
+    (find-usty-tui tui)))
+
+(defun find-usab-all ()
+  "Find usab for a key"
+  (collect-umlisp-query (mrsab (vcui rcui vsab rsab son sf sver vstart vend 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 :vstart vstart :vend vend :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"
+  (collect-umlisp-query-eval ('mrsab '(vcui rcui vsab rsab son sf sver vstart
+				    vend 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 :vstart vstart :vend vend :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"
+  (find-usab-by-key 'rsab rsab))
+
+(defun find-usab-vsab (vsab)
+  "Find usab for vsab"
+  (find-usab-by-key 'vsab vsab))
 
 (defun find-cui-max ()
-  (let ((cui (caar (mutex-sql-query "select max(CUI) from MRCON"))))
-    (ensure-integer cui)))
+  (ensure-integer (caar (mutex-sql-query "select max(CUI) from MRCON"))))
 
 ;;;; Cross table find functions
 
 (defun find-ucon-tui (tui &key (srl *current-srl*))
   "Find list of ucon for tui"
-  (when (stringp tui)
-      (setq tui (parse-tui tui)))
-  (let ((ucons '())
-	(ls (format nil "select CUI from MRSTY where TUI=~d" tui)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by cui desc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (find-ucon-cui (ensure-integer (car tuple)) :srl srl) ucons))
-    ucons))
+  (ensure-tui-integer tui)
+  (collect-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))
   "Return list of ucons that match word. Optionally, use SQL's LIKE syntax"
-  (let ((ucons '())
-	(ls (format nil "select distinct cui from MRXW_ENG where wd~A'~A'" 
-		    (if like " LIKE " "=") 
-		    word)))
-    (when srl
-      (string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by cui desc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (find-ucon-cui (car tuple) :srl srl) ucons))
-    ucons))
+  (collect-umlisp-query-eval ('mrxw_eng '(cui) srl 'wd word :like like :distinct t
+				     :lrl 'klrl :order '(cui asc))
+    (find-ucon-cui cui :srl srl)))
 
 (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"
-  (let ((ucons '())
-	(ls (format nil "select distinct cui from MRXNW_ENG where nwd~A'~A'" 
-		    (if like " LIKE " "=")
-		    word)))
-    (when srl
-      (string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by cui desc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (find-ucon-cui (car tuple) :srl srl) ucons))
-    ucons))
+  (collect-umlisp-query-eval ('mrxnw_eng '(cui) srl 'nwd word :like like :distinct t
+				      :lrl 'klrl :order '(cui asc))
+    (find-ucon-cui cui :srl srl)))
+
+(defun find-cui-normalized-word (word &key (srl *current-srl*) (like nil))
+  "Return list of cui that match word, optionally use SQL's LIKE syntax"
+  (collect-umlisp-query-eval ('mrxnw_eng '(cui) srl 'nwd word :like like :distinct t
+					 :lrl 'klrl :order '(cui asc))
+			     cui))
+
+(defun find-lui-normalized-word (word &key (srl *current-srl*) (like nil))
+  "Return list of cui that match word, optionally use SQL's LIKE syntax"
+  (collect-umlisp-query-eval ('mrxnw_eng '(lui) srl 'nwd word :like like :distinct t
+					 :lrl 'klrl :order '(cui asc))
+			     lui))
+
+(defun find-sui-normalized-word (word &key (srl *current-srl*) (like nil))
+  "Return list of cui that match word, optionally use SQL's LIKE syntax"
+  (collect-umlisp-query-eval ('mrxnw_eng '(sui) srl 'nwd word :like like :distinct t
+					 :lrl 'klrl :order '(cui asc))
+			     sui))
 
 (defun find-ustr-word (word &key (srl *current-srl*))
   "Return list of ustrs that match word"
-  (let ((ustrs '())
-	(ls (format nil "select cui,sui from MRXW_ENG where wd='~a'" word)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by cui desc,sui desc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (find-ustr-cuisui (ensure-integer (car tuple)) (ensure-integer (cadr tuple)) :srl srl)
-	    ustrs))
-    ustrs))
+  (collect-umlisp-query (mrxw_eng (cui sui) srl wd word :lrl klrl
+			       :order (cui asc sui asc))
+    (find-ustr-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl)))
 
 (defun find-ustr-normalized-word (word &key (srl *current-srl*))
   "Return list of ustrs that match word"
-  (let ((ustrs '())
-	(ls (format nil "select cui,sui from MRXNW_ENG where nwd='~a'" word)))
-    (when srl
-	(string-append ls (format nil " and KLRL <= ~d" srl)))
-    (string-append ls " order by cui desc,sui desc")
-    (dolist (tuple (mutex-sql-query ls))
-      (push (find-ustr-cuisui (ensure-integer (car tuple)) (ensure-integer (cadr tuple)) :srl srl)
-	    ustrs))
-    ustrs))
-
+  (collect-umlisp-query (mrxnw_eng (cui sui) srl nwd word :lrl klrl
+				 :order (cui asc sui asc))
+    (find-ustr-cuisui (ensure-integer cui) (ensure-integer sui) :srl srl)))
+
+(defun find-uterm-word (word &key (srl *current-srl*))
+  "Return list of uterms that match word"
+  (collect-umlisp-query (mrxw_eng (cui lui) srl wd word :lrl klrl
+			       :order (cui asc lui asc))
+    (find-uterm-cuilui (ensure-integer cui) (ensure-integer lui) :srl srl)))
+
+(defun find-uterm-normalized-word (word &key (srl *current-srl*))
+  "Return list of uterms that match word"
+  (collect-umlisp-query (mrxnw_eng (cui lui) srl nwd word :lrl klrl
+				 :order (cui asc lui asc))
+    (find-uterm-cuilui (ensure-integer cui) (ensure-integer lui) :srl srl)))
+
+(defun find-ucon-noneng-word (word &key (srl *current-srl*) (like nil))
+  "Return list of ucons that match non-english word"
+  (collect-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"
+  (collect-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 ()
+  (collect-umlisp-query (usrl (sab srl) nil nil nil :order (sab asc))
+    (make-instance 'usrl :sab sab :srl (ensure-integer srl))))
 
 ;;; Multiword lookup and score functions
 
-(defun find-ucon-multiword (str &key (srl *current-srl*))
-  "Return sorted list of ucon's that match a multiword string"
-  (let* ((words (delimited-string-to-list str #\space))
-	 (ucons '()))
-    (dolist (word words)
-      (setq ucons (append ucons (find-ucon-word word :srl srl))))
-    (sort-score-ucon-str str (delete-duplicates ucons :test #'eql :key #'cui))))
-
-(defun find-ustr-multiword (str &key (srl *current-srl*))
-  "Return sorted list of ustr's that match a multiword string"
-  (let* ((words (delimited-string-to-list str #\space))
-	 (ustrs '()))
-    (dolist (word words)
-      (setq ustrs (append ustrs (find-ustr-word word :srl srl))))
-    (sort-score-ustr-str str (delete-duplicates ustrs :test #'eql :key #'cui))))
+(defun find-uobj-multiword (str obj-lookup-fun sort-fun key srl
+			    only-exact-if-match)
+  (let ((uobjs '()))
+    (dolist (word (delimited-string-to-list str #\space))
+      (setq uobjs (append uobjs (funcall obj-lookup-fun word :srl srl))))
+    (let ((sorted 
+	   (funcall sort-fun str
+		    (delete-duplicates uobjs :test #'= :key key))))
+      (if (and (plusp (length sorted))
+	       only-exact-if-match
+	       (multiword-match str (pfstr (first sorted))))
+	  (first sorted)
+	sorted))))
+    
+(defun find-ucon-multiword (str &key (srl *current-srl*)
+				     (only-exact-if-match t))
+  (find-uobj-multiword str #'find-ucon-word #'sort-score-pfstr-str
+		       #'cui srl only-exact-if-match))
+
+(defun find-uterm-multiword (str &key (srl *current-srl*)
+				      (only-exact-if-match t))
+  (find-uobj-multiword str #'find-uterm-word #'sort-score-pfstr-str
+		       #'lui srl only-exact-if-match))
+
+(defun find-ustr-multiword (str &key (srl *current-srl*)
+				     (only-exact-if-match t))
+  (find-uobj-multiword str #'find-ustr-word #'sort-score-ustr-str
+		       #'sui srl only-exact-if-match))
 	
-(defun sort-score-ucon-str (str ucons)
+(defun sort-score-pfstr-str (str uobjs)
   "Return list of sorted and scored ucons. Score by match of str to ucon-pfstr"
-  (sort-score-umlsclass-str ucons str #'pfstr))
+  (sort-score-umlsclass-str uobjs str #'pfstr))
 
 (defun sort-score-ustr-str (str ustrs)
   "Return list of sorted and scored ucons. Score by match of str to ucon-pfstr"
@@ -662,330 +671,216 @@
   "Sort a list of objects based on scoring to a string"
   (let ((scored '()))
     (dolist (obj objs)
-      (push 
-       (list obj 
-	     (score-multiword-match str (funcall lookup-func obj))) 
+      (push (list obj (score-multiword-match str (funcall lookup-func obj))) 
        scored))
     (mapcar #'car (sort scored #'> :key #'cadr))))
 
-(defun score-multiword-match (s1 s2)
-  "Score a match between two strings with s1 being reference string"
-  (let* ((word-list-1 (delimited-string-to-list s1 #\space))
-	 (word-list-2 (delimited-string-to-list s2 #\space))
-	 (n1 (length word-list-1))
-	 (n2 (length word-list-2))
-	 (unmatched n1)
-	 (score 0)
-	 (nlong 0)
-	 (nshort 0)
-	 short-list long-list)
-    (declare (fixnum n1 n2 nshort nlong score unmatched))
-    (if (> n1 n2)
-	(progn
-	  (setq nlong n1)
-	  (setq nshort n2)
-	  (setq long-list word-list-1)
-	  (setq short-list word-list-2))
-      (progn
-	(setq nlong n2)
-	(setq nshort n1)
-	(setq long-list word-list-2)
-	(setq short-list word-list-1)))
-    (decf score (- nlong nshort)) ;; reduce score for extra words
-    (dotimes (iword nshort)
-      (declare (fixnum iword))
-      (kmrcl:aif (position (nth iword short-list) long-list :test #'string-equal)
-	   (progn
-	     (incf score (- 10 (abs (- kmrcl::it iword))))
-	     (decf unmatched))))
-    (decf score (* 2 unmatched))
-    score))
-
 
 ;;; LEX SQL functions
 
 (defun find-lexterm-eui (eui)
-  (kmrcl:awhen (car (mutex-sql-query
-		  (format nil "select WRD from LRWD where EUI=~d" eui)))
-	    (make-instance 'lexterm :eui eui :wrd (nth 0 kmrcl:it))))
+  (ensure-eui-integer eui)
+  (collect-umlisp-query (lrwd (wrd) nil eui eui :single t)
+    (make-instance 'lexterm :eui eui :wrd wrd)))
 
 (defun find-lexterm-word (wrd)
-  (kmrcl:awhen (mutex-sql-query
-	     (format nil "select EUI from LRWD where WRD='~a'" wrd))
-	    (let ((terms '()))
-	      (dolist (tuple kmrcl:it)
-		(let ((eui (ensure-integer (nth 0 tuple))))
-		  (push
-		   (make-instance 'lexterm :eui eui :wrd (copy-seq wrd))
-		   terms)))
-	      (nreverse terms))))
-
-;; LEXTERM accessors, read on demand
-	      
-(def-lazy-reader lexterm s#abr find-labr-eui eui)
-(def-lazy-reader lexterm s#agr find-lagr-eui eui)
-(def-lazy-reader lexterm s#cmp find-lcmp-eui eui)
-(def-lazy-reader lexterm s#mod find-lmod-eui eui)
-(def-lazy-reader lexterm s#nom find-lnom-eui eui)
-(def-lazy-reader lexterm s#prn find-lprn-eui eui)
-(def-lazy-reader lexterm s#prp find-lprp-eui eui)
-(def-lazy-reader lexterm s#spl find-lspl-eui eui)
-(def-lazy-reader lexterm s#trm find-ltrm-eui eui)
-(def-lazy-reader lexterm s#typ find-ltyp-eui eui)
+  (collect-umlisp-query (lrwd (eui) nil wrd wrd)
+    (make-instance 'lexterm :eui (ensure-integer eui)
+		   :wrd (copy-seq wrd))))
 
 ;; LEX SQL Read functions
 
 (defun find-labr-eui (eui)
-    (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,ABR,EUI2,BAS2 from LRABR where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'labr :eui eui 
-				  :bas (nth 0 tuple) 
-				  :abr (nth 1 tuple)
-				  :eui2 (ensure-integer (nth 2 tuple))
-				  :bas2 (nth 3 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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))))
 
 (defun find-labr-bas (bas)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select EUI,ABR,EUI2,BAS2 from LRABR where BAS='~a'" bas))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'labr :eui (ensure-integer (nth 0 tuple))
-				  :bas (copy-seq bas)
-				  :abr (nth 1 tuple)
-				  :eui2 (ensure-integer (nth 2 tuple))
-				  :bas2 (nth 3 tuple))
-		   results))
-		(nreverse results))))
+  (collect-umlisp-query (labr (eui abr eui2 bas2) nil bas bas)
+    (make-instance 'labr :eui (ensure-integer eui) :abr abr :bas2 bas2
+		   :bas (copy-seq bas) :eui2 (ensure-integer eui2))))
 
 (defun find-lagr-eui (eui)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select STR,SCA,AGR,CIT,BAS from LRAGR where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lagr 
-				  :eui eui
-				  :str (nth 0 tuple)
-				  :sca (nth 1 tuple)
-				  :agr (nth 2 tuple)
-				  :cit (nth 3 tuple)
-				  :bas (nth 4 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,SCA,COM from LRCMP where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lcmp
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :sca (nth 1 tuple)
-				  :com (nth 2 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,SCA,PSN_MOD,FEA from LRMOD where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lmod
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :sca (nth 1 tuple)
-				  :psnmod (nth 2 tuple)
-				  :fea (nth 3 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,SCA,EUI2,BAS2,SCA2 from LRNOM where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lnom
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :sca (nth 1 tuple)
-				  :eui2 (ensure-integer (nth 2 tuple))
-				  :bas2 (nth 3 tuple)
-				  :sca2 (nth 4 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,NUM,GND,CAS,POS,QNT,FEA from LRPRN where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lprn
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :num (nth 1 tuple)
-				  :gnd (nth 2 tuple)
-				  :cas (nth 3 tuple)
-				  :pos (nth 4 tuple)
-				  :qnt (nth 5 tuple)
-				  :fea (nth 6 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,STR,SCA,FEA from LRPRP where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lprp
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :str (nth 1 tuple)
-				  :sca (nth 2 tuple)
-				  :fea (nth 3 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-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)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select SPV,BAS from LRSPL where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'lspl
-				  :eui eui
-				  :spv (nth 0 tuple)
-				  :bas (nth 1 tuple))
-		   results))
-		(nreverse results))))
-
+  (ensure-eui-integer eui)
+  (collect-umlisp-query (lrspl (spv bas) nil eui eui)
+    (make-instance 'lspl :eui eui :spv spv :bas bas)))
 
 (defun find-ltrm-eui (eui)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,GEN from LRTRM where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'ltrm
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :gen (nth 1 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-umlisp-query (lrtrm (bas gen) nil eui eui) 
+    (make-instance 'ltrm :eui eui :bas bas :gen gen)))
 
 (defun find-ltyp-eui (eui)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select BAS,SCA,TYP from LRTYP where EUI=~d" eui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'ltyp
-				  :eui eui
-				  :bas (nth 0 tuple)
-				  :sca (nth 1 tuple)
-				  :typ (nth 2 tuple))
-		   results))
-		(nreverse results))))
+  (ensure-eui-integer eui)
+  (collect-umlisp-query (lrtyp (bas sca typ) nil eui eui)
+    (make-instance 'ltyp :eui eui :bas bas :sca sca :typ typ)))
 
 (defun find-lwd-wrd (wrd)
-  (kmrcl:awhen (mutex-sql-query 
-	     (format nil "select EUI from LRWD where WRD='~a'" wrd))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push (ensure-integer (nth 0 tuple)) results))
-		(make-instance 'lwd :wrd wrd
-			       :euilist (nreverse results)))))
+  (make-instance 'lwd :wrd wrd
+		 :euilist (collect-umlisp-query (lrwd (eui) nil wrd wrd)
+						(ensure-integer eui))))
 
 ;;; Semantic Network SQL access functions
- 
+
 (defun find-sdef-ui (ui)
-  (kmrcl:awhen (car (mutex-sql-query 
-		  (format nil "select RT,STY_RL,STN_RTN,DEF,EX,UN,RH,ABR,RIN from SRDEF where UI=~d" ui)))
-	    (make-instance 'sdef :rt (nth 0 kmrcl::it)
-			   :ui ui
-			   :styrl (nth 1 kmrcl::it)
-			   :stnrtn (nth 2 kmrcl::it)
-			   :def (nth 3 kmrcl::it)
-			   :ex (nth 4 kmrcl::it)
-			   :un (nth 5 kmrcl::it)
-			   :rh (nth 6 kmrcl::it)
-			   :abr (nth 7 kmrcl::it)
-			   :rin (nth 8 kmrcl::it))))
+  (collect-umlisp-query (srdef (rt sty_rl stn_rtn def ex un rh abr rin)
+			    nil ui ui :single t)
+    (make-instance 'sdef :rt rt :ui ui :styrl sty_rl :stnrtn stn_rtn
+		   :def def :ex ex :un un :rh rh :abr abr :rin rin)))
 
 (defun find-sstre1-ui (ui)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select UI2,UI3 from SRSTRE1 where UI=~d" ui))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'sstre1 :ui ui
-				  :ui2 (ensure-integer (nth 0 tuple))
-				  :ui3 (ensure-integer (nth 1 tuple)))
-		   results))
-		(nreverse results))))
+  (collect-umlisp-query (srstre1 (ui2 ui3) nil ui ui)
+    (make-instance 'sstre1 :ui ui :ui2 (ensure-integer ui2)
+		   :ui3 (ensure-integer ui3))))
 
 (defun find-sstre1-ui2 (ui2)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select UI,UI3 from SRSTRE1 where UI2=~d" ui2))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'sstre1 :ui (ensure-integer (nth 0 tuple))
-				  :ui2 ui2
-				  :ui3 (ensure-integer (nth 1 tuple)))
-		   results))
-		(nreverse results))))
+  (collect-umlisp-query (srstre1 (ui ui3) nil ui2 ui2)
+    (make-instance 'sstre1 :ui (ensure-integer ui) :ui2 ui2
+		   :ui3 (ensure-integer ui3))))
 
 (defun find-sstr-rl (rl)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select STY_RL,STY_RL2,LS from SRSTRE where RL='~a'" rl))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'sstr 
-				  :rl rl
-				  :styrl (nth 0 tuple)
-				  :styrl2 (nth 1 tuple)
-				  :ls (nth 2 tuple))
-		   results))
-		(nreverse results))))
-
+  (collect-umlisp-query (srstre (sty_rl sty_rl2 ls) nil rl rl)
+    (make-instance 'sstr :rl rl :styrl sty_rl :styrl2 sty_rl2 :ls ls)))
 
 (defun find-sstre2-sty (sty)
-  (kmrcl:awhen (mutex-sql-query 
-	     (format nil "select RL,STY2 from SRSTRE2 where STY='~a'" sty))
-	    (let ((results '()))
-	      (dolist (tuple kmrcl::it)
-		(push
-		 (make-instance 'sstre2
-				:sty (copy-seq sty)
-				:rl (nth 0 tuple)
-				:sty2 (nth 1 tuple))
-				results))
-		(nreverse results))))
+  (collect-umlisp-query (srstre2 (rl sty2) nil sty sty)
+    (make-instance 'sstre2 :sty (copy-seq sty) :rl rl :sty2 sty2)))
 
 (defun find-sstr-styrl (styrl)
-  (kmrcl:awhen (mutex-sql-query 
-	       (format nil "select RL,STY_RL2,LS from SRSTR where RL='~a'" styrl))
-	      (let ((results '()))
-		(dolist (tuple kmrcl::it)
-		  (push
-		   (make-instance 'sstr :styrl styrl
-				  :rl (nth 0 tuple)
-				  :styrl2 (nth 1 tuple)
-				  :ls (nth 2 tuple))
-		   results))
-		(nreverse results))))
+  (collect-umlisp-query (srstr (rl sty_rl2 ls) nil styrl styrl)
+    (make-instance 'sstr :styrl styrl :rl rl :styrl2 sty_rl2 :ls ls)))
+
+
+;;; **************************
+;;; Local Classes
+;;; **************************
+
+
+(defun make-ustats ()
+  (with-sql-connection (conn)
+    (ignore-errors (sql-execute "drop table USTATS" conn))
+    (sql-execute "create table USTATS (NAME varchar(160), COUNT bigint, SRL integer)" conn)
+    
+    (dotimes (srl 4)
+      (insert-ustats-count conn "Concept Count" "MRCON" "distinct CUI" "KCUILRL" srl)
+      (insert-ustats-count conn "Term Count" "MRCON" "distinct KCUILUI" "KCUILRL" srl)
+      (insert-ustats-count conn "Distinct Term Count" "MRCON" "distinct LUI" "KLUILRL" srl)
+      (insert-ustats-count conn "String Count" "MRCON" "*" "LRL" srl)
+      (insert-ustats-count conn "Distinct String Count" "MRCON" "distinct SUI" "LRL" srl)
+      (insert-ustats-count conn "Associated Expression Count" "MRATX" "*" "KSRL" srl)
+      (insert-ustats-count conn "Context Count" "MRCXT" "*" "KSRL" srl)
+      (insert-ustats-count conn "Co-occuring Concept Count" "MRCOC" "*" "KLRL" srl)
+      (insert-ustats-count conn "Definition Count" "MRDEF" "*" "KSRL" srl)
+      (insert-ustats-count conn "Locator Count" "MRLO" "*" "KLRL" srl)
+      (insert-ustats-count conn "Rank Count" "MRRANK" "*" "KSRL" srl)
+      (insert-ustats-count conn "Relationship Count" "MRREL" "*" "KSRL" srl)
+      (insert-ustats-count conn "Semantic Type Count" "MRSTY" "*" "KLRL" srl)
+      (insert-ustats-count conn "Simple Attribute Count" "MRSAT" "*" "KSRL" srl)
+      (insert-ustats-count conn "Source Count" "MRSO" "*" "SRL" srl)
+      (insert-ustats-count conn "Word Index Count" "MRXW_ENG" "*" "KLRL" srl)
+      (insert-ustats-count conn "Normalized Word Index Count" "MRXNW_ENG" "*" "KLRL" srl)
+      (insert-ustats-count conn "Normalized String Index Count" "MRXNS_ENG" "*" "KLRL" srl)
+      (insert-ustats-count conn "Bonus Attribute Name Count" "BONUS_ATN" "*" nil srl)
+      (insert-ustats-count conn "Bonus Relationship Count" "BONUS_REL" "*" nil srl)
+      (insert-ustats-count conn "Bonus Source Abbreviation Count" "BONUS_SAB" "*" nil srl)
+      (insert-ustats-count conn "Bonus Term Type Count" "BONUS_TTY" "*" nil srl))
+    (sql-execute "create index USTATS_SRL on USTATS (SRL)" conn))
+  (find-ustats-all))
+
+(defun insert-ustats-count (conn name table count-variable srl-control srl)
+  (insert-ustats conn name (find-count-table conn table srl count-variable srl-control) srl))
+
+(defun find-count-table (conn table srl count-variable srl-control)
+  (cond
+   ((stringp srl-control)
+    (ensure-integer 
+     (caar (sql-query (format nil "select count(~a) from ~a where ~a <= ~d" 
+			      count-variable table srl-control srl)
+		      conn))))
+   ((null srl-control)
+    (ensure-integer
+     (caar (sql-query (format nil "select count(~a) from ~a" 
+			      count-variable table )
+		      conn))))
+   (t
+    (error "Unknown srl-control")
+    0)))
+
+(defun insert-ustats (conn name count srl)
+  (sql-execute (format nil "insert into USTATS (name,count,srl) values ('~a',~d,~d)" 
+		       name count (if srl srl 3)) 
+	       conn))
+
+(defun find-ustats-all (&key (srl *current-srl*))
+  (if srl
+      (collect-umlisp-query (ustats (name count srl) nil srl srl
+				    :order (name asc))
+			    (make-instance 'ustats :name name
+					   :hits (ensure-integer count)
+					   :srl (ensure-integer srl)))
+    (collect-umlisp-query (ustats (name count srl) nil nil nil
+				  :order (name asc))
+			  (make-instance 'ustats :name name
+					 :hits (ensure-integer count)
+					 :srl (ensure-integer srl)))))
+  
+(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))))
+
+
+
+(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))))