From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sat, 3 May 2003 17:10:08 +0000 (+0000)
Subject: r4746: *** empty log message ***
X-Git-Tag: v2006ac.2~251
X-Git-Url: http://git.kpe.io/?p=umlisp.git;a=commitdiff_plain;h=380fefd012a0ef9b6b75833debd1d90155b7a060

r4746: *** empty log message ***
---

diff --git a/sql-classes.lisp b/sql-classes.lisp
index e954fe8..cf210ea 100644
--- 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 7366f8a..79fd4e3 100644
--- 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 f2d0cb3..1c8cb6a 100644
--- 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")))