r9039: 2003AC updates

diff --git a/classes.lisp b/classes.lisp
index a263a8bf03747a64fa3a9098b2697c19303a2273..e066b362d883353410e4bafb95a4d3c1542ffde2 100644 (file)
--- a/classes.lisp
+++ b/classes.lisp
@@ -67,8 +67,8 @@
    (son :value-type string :initarg :son :reader son)
    (sf :value-type string :initarg :sf :reader sf)
    (sver :value-type string :initarg :sver :reader sver)
    (son :value-type string :initarg :son :reader son)
    (sf :value-type string :initarg :sf :reader sf)
    (sver :value-type string :initarg :sver :reader sver)

-   (mstart :value-type string :initarg :mstart :reader mstart)
-   (mend :value-type string :initarg :mend :reader mend)
+   (vstart :value-type string :initarg :vstart :reader vstart)
+   (vend :value-type string :initarg :vend :reader vend)

    (imeta :value-type string :initarg :imeta :reader imeta)
    (rmeta :value-type string :initarg :rmeta :reader rmeta)
    (slc :value-type cdata :initarg :slc :reader slc)
    (imeta :value-type string :initarg :imeta :reader imeta)
    (rmeta :value-type string :initarg :rmeta :reader rmeta)
    (slc :value-type cdata :initarg :slc :reader slc)


@@ -85,7 +85,7 @@
    (sabin :value-type string :initarg :sabin :reader sabin))
   (:metaclass hyperobject-class)
   (:user-name "Source Abbreviation")
    (sabin :value-type string :initarg :sabin :reader sabin))
   (:metaclass hyperobject-class)
   (:user-name "Source Abbreviation")

-  (:default-print-slots vcui rcui vsab rsab son sf sver mstart mend imeta
+  (:default-print-slots vcui rcui vsab rsab son sf sver vstart vend imeta

                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin))
 
                rmeta slc scc srl tfr cfr cxty ttyl atnl lat cenc
                curver sabin))
 

diff --git a/data-structures.lisp b/data-structures.lisp
index b4cdb98aebf52ff1dcd769dd6466256262b8cfc1..b5c35762d5240cebf24fc30facc50d30a3882184 100644 (file)
--- a/data-structures.lisp
+++ b/data-structures.lisp
@@ -10,7 +10,7 @@
 ;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is
 ;;;; $Id$
 ;;;;
 ;;;; This file, part of UMLisp, is

-;;;;    Copyright (c) 2000-2003 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.
 ;;;;
 ;;;; UMLisp users are granted the rights to distribute and use this software
 ;;;; as governed by the terms of the GNU General Public License.


@@ -21,7 +21,7 @@
 ;;; Paths for files
 
 (defvar *umls-path*
 ;;; Paths for files
 
 (defvar *umls-path*

-  (make-pathname :directory '(:absolute "data" "umls" "2003AB"))
+  (make-pathname :directory '(:absolute "data" "umls" "2003AC"))

   "Path for base of UMLS data files")
 
 (defvar *meta-path* 
   "Path for base of UMLS data files")
 
 (defvar *meta-path* 

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 6ef05ed1dadc5f0a0008ae0b33f7b2b7daa8d9b3..2171632836fd8048ea05f4ab8550072b59cf24a7 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -510,12 +510,12 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 
 (defun find-usab-all ()
   "Find usab for a key"
 
 (defun find-usab-all ()
   "Find usab for a key"

-  (collect-umlisp-query (mrsab (vcui rcui vsab rsab son sf sver mstart mend imeta
+  (collect-umlisp-query (mrsab (vcui rcui vsab rsab son sf sver vstart vend imeta

                                  rmeta slc scc srl tfr cfr cxty ttyl atnl lat
                                  cenc curver sabin) nil nil nil)
     (make-instance 'usab :vcui (ensure-integer vcui) 
                   :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son
                                  rmeta slc scc srl tfr cfr cxty ttyl atnl lat
                                  cenc curver sabin) nil nil nil)
     (make-instance 'usab :vcui (ensure-integer vcui) 
                   :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son

-                  :sf sf :sver sver :mstart mstart :mend mend :imeta imeta
+                  :sf sf :sver sver :vstart vstart :vend vend :imeta imeta

                   :rmeta rmeta :slc slc :scc scc  :srl (ensure-integer srl)
                   :tfr (ensure-integer tfr) :cfr (ensure-integer cfr)
                   :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc
                   :rmeta rmeta :slc slc :scc scc  :srl (ensure-integer srl)
                   :tfr (ensure-integer tfr) :cfr (ensure-integer cfr)
                   :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc


@@ -523,13 +523,13 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
 
 (defun find-usab-by-key (key-name key)
   "Find usab for a key"
 
 (defun find-usab-by-key (key-name key)
   "Find usab for a key"

-  (collect-umlisp-query-eval ('mrsab '(vcui rcui vsab rsab son sf sver mstart
-                                   mend imeta rmeta slc scc srl tfr cfr cxty
+  (collect-umlisp-query-eval ('mrsab '(vcui rcui vsab rsab son sf sver vstart
+                                   vend imeta rmeta slc scc srl tfr cfr cxty

                                    ttyl atnl lat cenc curver sabin)
                                  nil key-name key :single t)
     (make-instance 'usab :vcui (ensure-integer vcui) 
                   :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son
                                    ttyl atnl lat cenc curver sabin)
                                  nil key-name key :single t)
     (make-instance 'usab :vcui (ensure-integer vcui) 
                   :rcui (ensure-integer rcui) :vsab vsab :rsab rsab :son son

-                  :sf sf :sver sver :mstart mstart :mend mend :imeta imeta
+                  :sf sf :sver sver :vstart vstart :vend vend :imeta imeta

                   :rmeta rmeta :slc slc :scc scc :srl (ensure-integer srl)
                   :tfr (ensure-integer tfr) :cfr (ensure-integer cfr)
                   :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc
                   :rmeta rmeta :slc slc :scc scc :srl (ensure-integer srl)
                   :tfr (ensure-integer tfr) :cfr (ensure-integer cfr)
                   :cxty cxty :ttyl ttyl :atnl atnl :lat lat :cenc cenc

diff --git a/sql.lisp b/sql.lisp
index d00c7bedf15666a8f7891a67f213c02855fddb87..39f82dc2767ad65a8146428341df8ee638662725 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -22,7 +22,7 @@
     '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
       (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
       (:2004AA . "KUMLS2004AA")))
     '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
       (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
       (:2004AA . "KUMLS2004AA")))

-(defvar +default-umls-db+ :2003AB)
+(defvar +default-umls-db+ :2003AC)

 
 
 (defun lookup-db-name (db)
 
 
 (defun lookup-db-name (db)


@@ -35,7 +35,7 @@
 (defun umls-sql-db! (db)
   (setq *umls-sql-db* db))
 
 (defun umls-sql-db! (db)
   (setq *umls-sql-db* db))
 

-(umls-sql-db! :2003AB)
+(umls-sql-db! :2003AC)

 
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()
 
 (defvar *umls-sql-user* "secret")
 (defun umls-sql-user ()