X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=data-structures.lisp;h=dfa28458383cb94597026ca5ea72e857093d49d4;hb=f761dc1d39bb92917db53f935348f79e4db95e40;hp=9f41d773c953ab699ccc196e4a85408cb857e64f;hpb=cc146d0b1c7d6d7a050713754f1ea9a8d71a46b5;p=umlisp.git

diff --git a/data-structures.lisp b/data-structures.lisp
index 9f41d77..dfa2845 100644
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: data-structures.lisp,v 1.6 2003/05/06 02:14:59 kevin Exp $
+;;;; $Id: data-structures.lisp,v 1.10 2003/05/07 21:57:06 kevin Exp $
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;;    Copyright (c) 2000-2002 by Kevin M. Rosenberg, M.D.
@@ -53,3 +53,50 @@
 (defparameter *umls-cols* nil 
   "List of meta column structures. Used when parsing text files.")
 
+
+;; Preliminary objects to replace structures
+
+(defclass ufile ()
+  ((fil :initarg :fil :accessor fil)
+   (table :initarg :table :accessor table)
+   (des :initarg :des :accessor des)
+   (fmt :initarg :fmt :accessor fmt)
+   (cls :initarg :cls :accessor cls)
+   (rws :initarg :rws :accessor rws)
+   (bts :initarg :bts :accessor bts)
+   (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)
+  (:documentation "UMLS File"))
+
+(defclass ucol ()
+  ((col :initarg :col :accessor col)
+   (des :initarg :des :accessor des)
+   (ref :initarg :ref :accessor ref)
+   (min :initarg :min :accessor cmin)
+   (av :initarg :av :accessor av)
+   (max :initarg :max :accessor cmax)
+   (fil :initarg :fil :accessor fil)
+   (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)
+   (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
+		     :sqltype nil :dty nil :parse-fun nil :datatype nil
+		     :custom-value-fun nil)
+  (:documentation "UMLS column"))
+
+
+(defmethod print-object ((obj ufile) (s stream))
+  (print-unreadable-object (obj s :type t :identity t)
+    (format s "~A" (fil obj))))
+
+(defmethod print-object ((obj ucol) (s stream))
+  (print-unreadable-object (obj s :type t :identity t)
+    (format s "~A" (col obj))))
+
+
+