X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;ds=sidebyside;f=data-structures.lisp;h=7652fc8697159d3c174853481a1a556c98b0a0ba;hb=aeade16272b79115d3f307906c7a3e9597137e97;hp=c06b2ca0ac042d5296e5b4d08755be9e045437ae;hpb=ebbaacd0a589db2c590846742da33e3b4bf25d02;p=umlisp.git

diff --git a/data-structures.lisp b/data-structures.lisp
index c06b2ca..7652fc8 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.8 2003/05/06 07:17:35 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" "2003AC"))
   "Path for base of UMLS data files")
 
 (defvar *meta-path* 
@@ -81,7 +78,7 @@
    (sqltype :initarg :sqltype :accessor sqltype)
    (dty :initarg :dty :accessor dty :documentation "new in 2002: suggested SQL datatype")
    (parse-fun :initarg :parse-fun :accessor parse-fun)
-   (quotechar :initarg :quotechar :accessor quotechar)
+   (quote-str :initarg :quote-str :accessor quote-str)
    (datatype :initarg :datatype :accessor datatype)
    (custom-value-fun :initarg :custom-value-fun :accessor custom-value-fun))
   (:default-initargs :col nil :des nil :ref nil :min nil :av nil :max nil :fil nil
@@ -89,3 +86,14 @@
 		     :custom-value-fun nil)
   (:documentation "UMLS column"))
 
+
+(defmethod print-object ((obj ufile) (s stream))
+  (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)
+    (format s "~A" (col obj))))
+
+
+