r3474: *** empty log message ***

diff --git a/classes.lisp b/classes.lisp
index 643b904c4cb9a0aeddd40922e165ffb73600c853..2ca6b778f1484cd0c3dc01c3ddb8912ebb30c873 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: classes.lisp,v 1.16 2002/11/24 19:03:34 kevin Exp $
+;;;; $Id: classes.lisp,v 1.17 2002/11/25 07:45:36 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -94,8 +94,8 @@
                     :ttyl nil :atnl nil :lat nil :cenc nil :curver nil
                     :sabin nil)
   (:title "Source Abbreviation")
-  (:print-slots vcui rcui vsab rsab san sf sver mstart mend imeta
-               rmeta slc scc srl tfr csr cxty ttyl atnl lat cenc
+  (:print-slots vcui rcui vsab rsab son sf sver mstart mend imeta
+               rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin))
 
 (defclass uso (umlsclass)
@@ -124,7 +124,7 @@
   (:default-initargs :sab nil :code nil :rnk nil :cxn nil :cxl nil :cxs nil
                     :cui2 nil :hcd nil :rela nil :xc nil)
   (:title "Context")
-  (:print-slots sab code rnk cnx cxl hcd rela xc cui2 cxs))
+  (:print-slots sab code rnk cxn cxl hcd rela xc cui2 cxs))
 
 (defclass ustr (umlsclass)
   ((sui :type fixnum :initarg :sui :reader sui :print-formatter fmt-sui
@@ -155,7 +155,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :isn nil :fr nil :un nil :sui nil :sna nil :soui nil)
   (:title "Locator")
-  (:print-slots isn fr un sna soui sui suistr))
+  (:print-slots isn fr un sna soui sui))
 
 (defclass uterm (umlsclass)
   ((lui :type fixnum :initarg :lui :reader lui :reference find-uterm-lui)
@@ -298,7 +298,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :abr nil :eui2 nil :bas2 nil)
   (:title "Abbreviations and Acronyms")
-  (:print-slots eui bas absr eui2 bas3))
+  (:print-slots eui bas abr eui2 bas2))
 
 (defclass lagr  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@ -320,7 +320,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :com nil)
   (:title "Complementation")
-  (:print-slots eui bas sca cam))
+  (:print-slots eui bas sca com))
 
 (defclass lmod  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@ -331,7 +331,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :psnmod nil :fea nil)
   (:title "Modifiers")
-  (:print-slots eui bas scan psnmod fea))
+  (:print-slots eui bas sca psnmod fea))
 
 (defclass lnom  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@ -343,7 +343,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :eui nil :bas nil :sca nil :eui2 nil :bas2 nil :sca2 nil)
   (:title "Nominalizations")
-  (:print-slots eui bas eui2 bas2 sca2))
+  (:print-slots eui bas sca eui2 bas2 sca2))
 
 (defclass lprn  (umlsclass)
   ((eui :type integer :initarg :eui :reader eui :print-formatter fmt-eui)
@@ -437,7 +437,7 @@
   (:metaclass hyperobject-class)
   (:default-initargs :styrl nil :rl nil :styrl2 nil :ls nil)
   (:title "Structure of the Network")
-  (:print-slots styrl rl styl2 ls))
+  (:print-slots styrl rl styrl2 ls))
 
 (defclass sstre1 (umlsclass)
   ((ui :type integer :initarg :ui :reader ui :print-formatter fmt-tui)
@@ -538,10 +538,10 @@
 (defmethod print-umlsclass ((obj umlsclass) &key (os *standard-output*) (format :text)
                              (label nil) (file-wrapper t) (english-only nil) (subobjects nil)
                              (refvars nil))
-  (print-hyperobject obj :os os :format format :label label :subobjects subobjects
-                    :file-wrapper file-wrapper
-                    :english-only-function (if english-only #'english-term-p nil)
-                    :refvars refvars))
+  (view obj :os os :format format :label label :subobjects subobjects
+       :file-wrapper file-wrapper
+       :english-only-function (if english-only #'english-term-p nil)
+       :refvars refvars))
 
 
 (defmacro define-lookup-display (newfuncname lookup-func)

diff --git a/composite.lisp b/composite.lisp
index f440ac07d7192c881f9e101e93d0bb13509ef2ec..ee07f27bf859621daef4ee121fd6ca2ea1fb3479 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.15 2002/11/24 19:03:34 kevin Exp $
+;;;; $Id: composite.lisp,v 1.16 2002/11/25 07:45:36 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -122,7 +122,7 @@
                          (format nil "select count(*) from MRSO where SAB='~a'" 
                                  (sab usrl)))))))
        (push (make-instance 'usrl_freq :usrl usrl :freq freq) freqs)))
-    (sort freqs #'> :key #'usrl_freq-freq)))
+    (sort freqs #'> :key #'freq)))
 
 (defun find-ucon2_freq-coc-tui (ucon tui)
 "Return sorted list of tuples with ucon and freq that have co-occuring concepts of semantic type tui"