r4746: *** empty log message ***

diff --git a/sql-classes.lisp b/sql-classes.lisp
index e954fe83278928f9ce63085d1a07b7047c038b6d..cf210eafb27684952836c0664e100515086d0a5c 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: sql-classes.lisp,v 1.20 2003/05/03 00:27:30 kevin Exp $
+;;;; $Id: sql-classes.lisp,v 1.21 2003/05/03 17:10:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -134,24 +134,6 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
     (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr
                   :lrl (ensure-integer kcuilrl))))
 
-(defun f2 (&key (srl *current-srl*))
-  "Return list of all ucon's"
-  (with-umlisp-query ('mrcon (cui kpfstr kcuilrl) srl nil nil)
-    (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr
-                  :lrl (ensure-integer kcuilrl))))
-
-(defun f1 (&key (srl *current-srl*))
-  "Return list of all ucon's"
-  (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)
-     :database db)))
-
 (defun find-ucon-all (&key (srl *current-srl*))
   "Return list of all ucon's"
   (with-sql-connection (db)

diff --git a/tests.lisp b/tests.lisp
index 7366f8a485f6de0c56125fc18f4220a665ab386d..79fd4e324ac82d9dc5669824ad866654deab484c 100644 (file)
--- a/tests.lisp
+++ b/tests.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  May 2003
 ;;;;
-;;;; $Id: tests.lisp,v 1.2 2003/05/03 00:27:30 kevin Exp $
+;;;; $Id: tests.lisp,v 1.3 2003/05/03 17:10:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -52,3 +52,20 @@
 
 
               
+(defun f2 (&key (srl *current-srl*))
+  "Return list of all ucon's"
+  (umlisp::with-umlisp-query ('mrcon (cui kpfstr kcuilrl) srl nil nil)
+    (make-instance 'ucon :cui (ensure-integer cui) :pfstr kpfstr
+                  :lrl (ensure-integer kcuilrl))))
+
+(defun f1 (&key (srl *current-srl*))
+  "Return list of all ucon's"
+  (umlisp::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)
+     :database db)))

diff --git a/umlisp.asd b/umlisp.asd
index f2d0cb3485485ae06e903980c60056b2d46cb3f9..1c8cb6a96e993807a796560eb9641ad96281cd81 100644 (file)
--- a/umlisp.asd
+++ b/umlisp.asd
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: umlisp.asd,v 1.15 2003/05/02 18:47:53 kevin Exp $
+;;;; $Id: umlisp.asd,v 1.16 2003/05/03 17:10:08 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -41,10 +41,12 @@
   (oos 'load-op 'umlisp-tests)
   (oos 'test-op 'umlisp-tests))
 
+#+(or allegro lispworks cmu sbcl openmcl scl)
 (defsystem umlisp-tests
-    :depends-on (rt)
+    :depends-on (rt umlisp)
     :components ((:file "tests")))
 
+#+(or allegro lispworks cmu sbcl openmcl scl)
 (defmethod perform ((o test-op) (c (eql (find-system :umlisp-tests))))
   (or (funcall (intern (symbol-name '#:do-tests) (find-package '#:rtest)))
       (error "test-op failed")))