X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=data-structures.lisp;h=beb209a844b1c94eba38e24b875d23061a6bd0e4;hb=349464972190f5689f28e9894c666b712409f1fd;hp=dfa28458383cb94597026ca5ea72e857093d49d4;hpb=3199369942d2e5ab4f5b060c2c6b655caf505944;p=umlisp.git

diff --git a/data-structures.lisp b/data-structures.lisp
index dfa2845..beb209a 100644
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -2,15 +2,15 @@
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;
-;;;; Name:          data-structures.lisp
-;;;; Purpose:       Basic data objects for UMLisp
-;;;; Author:        Kevin M. Rosenberg
-;;;; Date Started:  Apr 2000
+;;;; Name:    data-structures.lisp
+;;;; Purpose:  Basic data objects for UMLisp
+;;;; Author:   Kevin M. Rosenberg
+;;;; Created:  Apr 2000
 ;;;;
-;;;; $Id: data-structures.lisp,v 1.10 2003/05/07 21:57:06 kevin Exp $
+;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2004 by Kevin M. Rosenberg, M.D.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.
@@ -18,13 +18,10 @@
 
 (in-package #:umlisp)
 
-(eval-when (:compile-toplevel)
-  (declaim (optimize (speed 3) (safety 1) (compilation-speed 0) (debug 3))))
-
 ;;; Paths for files
 
 (defvar *umls-path*
-  (make-pathname :directory '(:absolute "data" "umls" "2003AA"))
+  (make-pathname :directory '(:absolute "data" "umls" "2004AA"))
   "Path for base of UMLS data files")
 
 (defvar *meta-path* 
@@ -57,7 +54,9 @@
 ;; Preliminary objects to replace structures
 
 (defclass ufile ()
-  ((fil :initarg :fil :accessor fil)
+  ((subdir :initarg :subdir :accessor subdir)
+   (dir :initarg :dir :accessor dir)
+   (fil :initarg :fil :accessor fil)
    (table :initarg :table :accessor table)
    (des :initarg :des :accessor des)
    (fmt :initarg :fmt :accessor fmt)
@@ -67,7 +66,7 @@
    (fields :initarg :fields :accessor fields)
    (ucols :initarg :ucols :accessor ucols))
   (:default-initargs :fil nil :table nil :des nil :fmt nil :cls nil :rws nil :bts nil
-		     :fields nil :ucols nil)
+		     :fields nil :ucols nil :subdir nil :dir nil)
   (:documentation "UMLS File"))
 
 (defclass ucol ()
@@ -91,11 +90,11 @@
 
 
 (defmethod print-object ((obj ufile) (s stream))
-  (print-unreadable-object (obj s :type t :identity t)
+  (print-unreadable-object (obj s :type t)
     (format s "~A" (fil obj))))
 
 (defmethod print-object ((obj ucol) (s stream))
-  (print-unreadable-object (obj s :type t :identity t)
+  (print-unreadable-object (obj s :type t)
     (format s "~A" (col obj))))