Updates for new debian standards

[umlisp.git] / data-structures.lisp

diff --git a/data-structures.lisp b/data-structures.lisp
index 5f86198b396c32da53aa0cdcdcfda5f56d00c112..9fc75fffeeee6b6babd14da13f756bcb112b8937 100644 (file)
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -20,7 +20,7 @@
 
 ;;; Paths for files
 
-(defparameter *release* "2006AC")
+(defparameter *release* "2006AD")
 
 (defparameter *umls-path*
   (make-pathname :directory (list :absolute "srv" "umls" *release*))
@@ -45,7 +45,9 @@
   (merge-pathnames *net-dir* *umls-path*))
 
 (defun umls-path! (p)
-  (setq *umls-path* p)
+  (setq *umls-path* (etypecase p
+                      (string (parse-namestring p))
+                      (pathname p)))
   (setq *meta-path* (merge-pathnames *meta-dir* *umls-path*))
   (setq *lex-path* (merge-pathnames *lex-dir* *umls-path*))
   (setq *net-path* (merge-pathnames *net-dir* *umls-path*)))
@@ -81,7 +83,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 :subdir nil :dir nil)
+                     :fields nil :ucols nil :subdir nil :dir nil)
   (:documentation "UMLS File"))
 
 (defclass ucol ()
@@ -99,8 +101,8 @@
    (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)
+                     :sqltype nil :dty nil :parse-fun nil :datatype nil
+                     :custom-value-fun nil)
   (:documentation "UMLS column"))