r4756: Auto commit for Debian build

[umlisp.git] / composite.lisp

diff --git a/composite.lisp b/composite.lisp
index 0489853ff1fc11461c39d033620e6cc5ecc04bb8..07fe8ae0376a69c5fe92d9d248c718cae8e02132 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: composite.lisp,v 1.18 2002/12/13 05:43:38 kevin Exp $
+;;;; $Id: composite.lisp,v 1.20 2003/01/17 18:40:49 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -65,7 +65,7 @@
 ;;; Composite Objects
 
 (defclass freq (hyperobject)
-  ((freq :type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
+  ((freq :value-type integer :initarg :freq :accessor freq :print-formatter fmt-comma-integer))
   (:metaclass hyperobject-class)
   (:default-initargs :freq 0)
   (:user-name "Frequency class")
@@ -87,7 +87,7 @@
   (:description "Composite object of ustr/freq"))
 
 (defclass usty_freq (usty freq)
-  ((freq :type fixnum :initarg :freq :accessor freq))
+  ((freq :value-type fixnum :initarg :freq :accessor freq))
   (:metaclass hyperobject-class)
   (:user-name "Semantic Type and Count")
   (:default-print-slots tui freq sty)
@@ -99,8 +99,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 +122,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)