r4826: *** empty log message ***

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index a5b6f24b8796882b38bdc104590315807d463f91..c28cc954fd1928c1d143d9492407fa6e31d8bf7e 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -4,10 +4,10 @@
 ;;;;
 ;;;; Name:          composite.lisp
 ;;;; Purpose:       Composite Classes for UMLisp
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.19 2002/12/14 02:35:28 kevin Exp $
+;;;; $Id: composite.lisp,v 1.21 2003/05/06 02:14:59 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -16,8 +16,10 @@
 ;;;; 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)
+
+(eval-when (:compile-toplevel)
+  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
 
 
 ;;; Semantic type constants
@@ -99,8 +101,10 @@
       (let* ((tui (car tuple))
             (freq (ensure-integer 
                     (caar (mutex-sql-query 
-                           (format nil "select count(*) from MRSTY where TUI=~a" tui))))))
-       (push (make-instance 'usty_freq :usty (find-usty-tui tui) :freq freq) usty_freqs)))
+                           (format nil "select count(*) from MRSTY where TUI=~a" tui)))))
+            (usty (find-usty-tui tui)))
+       (push (make-instance 'usty_freq :sty (sty usty)
+                            :tui (tui usty) :freq freq) usty_freqs)))
     (sort usty_freqs #'> :key #'freq)))
 
 
@@ -120,7 +124,9 @@
                   (caar (mutex-sql-query 
                          (format nil "select count(*) from MRSO where SAB='~a'" 
                                  (sab usrl)))))))
-       (push (make-instance 'usrl_freq :usrl usrl :freq freq) freqs)))
+       (push (make-instance 'usrl_freq :sab (sab usrl) :srl (srl usrl) 
+                            :freq freq) 
+             freqs)))
     (sort freqs #'> :key #'freq)))
 
 (defun find-ucon2_freq-coc-tui (ucon tui)