Handle empty RRF files, add MTS2012AB

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/debian/changelog b/debian/changelog
index 8275e0482c5e65c9a6d2c02f95b26fb3d017c461..06f56c1394811b120b33223c116ada481d9db0f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-umlisp (1:2007ac.2-6) unstable; urgency=low
+
+  * debian/control: Fix typo in package description
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 02 Apr 2011 22:10:11 -0600
+
 cl-umlisp (1:2007ac.2-5) unstable; urgency=low
 
   * debian/watch Fix pattern match

diff --git a/debian/control b/debian/control
index abf3787473b0f8c2b9f8ccfdda315c8cbd7379ea..70f5fd0207823e833b8099fba5f94f10efe85e3d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: dh-lisp
 Build-Depends: debhelper (>= 7.0.0)
-Standards-Version: 3.8.2.0
+Standards-Version: 3.9.1.0
 Homepage: http://files.b9.com/umlisp/
 Vcs-Git: git://git.b9.com/umlisp.git
 Vcs-Browser: http://git.b9.com/?p=umlisp.git
@@ -15,5 +15,5 @@ Depends: ${misc:Depends}, cl-kmrcl, cl-sql, cl-sql-mysql, cl-hyperobject
 Description: Common Lisp interface for the Unified Medical Language System
  The Unified Medical Language System is a multi-gigabyte database of
  medical terminology. This a interface for Common Lisp programs that utilizes
- the a SQL database engine and Common Lisp meta-classes for efficient access
+ a SQL database engine and Common Lisp meta-classes for efficient access
  and formatting.

diff --git a/debian/source/format b/debian/source/format
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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-classes.lisp b/sql-classes.lisp
index 87d59bfeff89409b1a11e710afd14869fc12c4f2..b1373f004d8f14140bc9d1e5d10ed746a8e3f54d 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -563,7 +563,7 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 (defun find-ustr-cuisui (cuisui &key (srl *current-srl*))
   "Return the single ustr for cuisui"
   (collect-umlisp-query (mrconso (cui lui sui stt str suppress ksuilrl) srl kcuisui
-                                 cuisui :lrl lsuilrl :single t)
+                                 cuisui :lrl ksuilrl :single t)
     (make-instance 'ustr :sui sui :cui cui :cuisui cuisui
                    :lui (ensure-integer lui) :stt stt :str str :suppress suppress
                    :lrl (ensure-integer ksuilrl))))

diff --git a/sql.lisp b/sql.lisp
index dab38b8ba2d29bb059cacf073ca6fbcd23a0cf0b..3847d02492692f4d5da0c2ee85f87b0be93a937e 100644 (file)
--- a/sql.lisp
+++ b/sql.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-2012 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.
@@ -16,14 +16,14 @@
 
 (in-package #:umlisp)
 
-(defvar +umls-sql-map+
+(defparameter +umls-sql-map+
     '((:2004aa . "KUMLS2004AA")
       (:2006ac . "KUMLS2006AC")
       (:2006ad . "MTS2006AD")
       (:2009ab . "MTS2009AB")
       (:2010aa . "MTS2010AA")
       (:2012ab . "MTS2012AB")))
-(defvar +default-umls-db+ "MTS2012AB")
+(defvar +default-umls-db+ "MTS2012AA_ALL")
 
 (defun lookup-db-name (db)
   (cdr (assoc (ensure-keyword db) +umls-sql-map+)))