Update for new version of umls

diff --git a/classes.lisp b/classes.lisp
index 4df25abafb9a9664ede14c78579c20bfe155c9cb..2860498210891f385db04c9a7f77acc956f52184 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -171,11 +171,11 @@
   (:default-print-slots tui sty))
 
 (defclass urel (umlsclass)
-  ((rel :value-type string :initarg :rel :reader rel :hyperlink find-brel-rel)
+  ((rel :value-type string :initarg :rel :reader rel)
    (cui1 :value-type fixnum :initarg :cui1 :reader cui1 :print-formatter fmt-cui)
    (aui1 :value-type fixnum :initarg :aui1 :reader aui1 :print-formatter fmt-aui)
    (stype1 :value-type string  :initarg :stype1 :reader stype1)
-   (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-sui
+   (cui2 :value-type fixnum :initarg :cui2 :reader cui2 :hyperlink find-ucon-cui
          :print-formatter fmt-cui)
    (aui2 :value-type fixnum :initarg :aui2 :reader aui2 :hyperlink find-ucon-aui
          :print-formatter fmt-aui)
@@ -271,7 +271,7 @@
    (s#sat :reader s#sat :subobject (find-usat-ui cui))
    (s#rel :reader s#rel :subobject (find-urel-cui cui))
    (s#coc :reader s#coc :subobject (find-ucoc-cui cui)))
-  (:documentation "CONSO is a new concept from the RRF files. This object is a rather raw row from the MRCONSO table.")
+  (:documentation "CONSO is a new concept from the RRF files.")
   (:metaclass hyperobject-class)
   (:user-name "Concept")
   (:default-print-slots cui kcuilrl str sab))

diff --git a/data-structures.lisp b/data-structures.lisp
index 2db16ae8a8738e715c614b5a761bebe21c0e5b89..10e1c0c38f2e07bba00a417398c11ae114e3b9f6 100644 (file)
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -8,7 +8,7 @@
 ;;;; Created:  Apr 2000
 ;;;;
 ;;;; This file, part of UMLisp, is
-;;;;    Copyright (c) 2000-2010 by Kevin M. Rosenberg, M.D.
+;;;;    Copyright (c) 2000-2011 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,10 +18,10 @@
 
 ;;; Paths for files
 
-(defparameter *release* "2010AA")
+(defparameter *release* "2011AA")
 
 (defparameter *umls-path*
-  (make-pathname :directory (list :absolute "srv" "umls" *release*))
+  (make-pathname :directory (list :absolute "srv" "umls" *release* *release*))
   "Path for base of UMLS data files")
 
 (defparameter *meta-dir*

diff --git a/package.lisp b/package.lisp
index aa02443d847d389aa73bf0a5291798c1fb6d0e2c..63d442b7c331ebeab3b0105c329a102dfb305efc 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -99,6 +99,7 @@
          #:suistr
          #:print-umlsclass
          #:find-ucon-cui #:make-ucon-cui
+         #:find-ucon-aui
          #:find-uconso-cui
          #:find-uconso-sui
          #:find-uconso-cuisui

diff --git a/sql.lisp b/sql.lisp
index e1414d9d0840015702adcb18e5d22a112c1a92e6..b53d2cb553e5bd4606adeba6d3040a37ca0aeae7 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -16,13 +16,14 @@
 
 (in-package #:umlisp)
 
-(defvar +umls-sql-map+
+(defparameter +umls-sql-map+
     '((:2004aa . "KUMLS2004AA")
       (:2006ac . "KUMLS2006AC")
       (:2006ad . "MTS2006AD")
       (:2009ab . "MTS2009AB")
-      (:2010aa . "MTS2010AA")))
-(defvar +default-umls-db+ "MTS2010AA")
+      (:2010aa . "MTS2010AA_ALL")
+      (:2011aa . "UMLS2011AA")))
+(defvar +default-umls-db+ "MTS2010AA_ALL")
 
 (defun lookup-db-name (db)
   (cdr (assoc (ensure-keyword db) +umls-sql-map+)))