r9497: finish original orf package

diff --git a/composite.lisp b/composite.lisp
index d7b366e02e614baa5c01cbc73bb1c13c9b6b0634..d3e29a7188c4205f4400e0cec9a03df2a9443b0a 100644 (file)
--- a/composite.lisp
+++ b/composite.lisp
@@ -1,4 +1,4 @@
-;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp -*-
+;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10; Package: umlisp-orf -*-
 ;;;; *************************************************************************
 ;;;; FILE IDENTIFICATION
 ;;;;

diff --git a/package.lisp b/package.lisp
index 85650264f1031308279a9960755ccf11063da8ce..283cd9e99b1393b63df8630c7bf8133cec003c16 100644 (file)
--- a/package.lisp
+++ b/package.lisp
@@ -195,9 +195,9 @@
    #:usrl_freq
    )))
 
-(defpackage umlisp-user
+(defpackage umlisp-orf-user
   (:use  #:kmrcl #:common-lisp #:hyperobject)
-  (:import-from :umlisp . #1#)
+  (:import-from :umlisp-orf . #1#)
   (:export . #1#)
   (:documentation "User package for UMLisp")))
 

diff --git a/sql-classes.lisp b/sql-classes.lisp
index 13727ba0695ea5925823720394244681db08b8ab..70efa9219ff5b959d8aae388265951a2d54a3a98 100644 (file)
--- a/sql-classes.lisp
+++ b/sql-classes.lisp
@@ -240,10 +240,11 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (with-sql-connection (db)
     (clsql:map-query 
      'list
-     #'(lambda (cui pfstr cuilrl)
-        (make-instance 'ucon :cui (ensure-integer cui)
-                       :pfstr pfstr
-                       :lrl (ensure-integer cuilrl)))
+     #'(lambda (tuple)
+        (destructuring-bind (cui pfstr cuilrl) tuple
+          (make-instance 'ucon :cui (ensure-integer cui)
+                         :pfstr pfstr
+                         :lrl (ensure-integer cuilrl))))
      (query-string mrcon (cui kpfstr kcuilrl) srl nil nil
                   :order (cui asc) :distinct t)
      :database db)))
@@ -267,11 +268,12 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
   (with-sql-connection (db)
     (clsql:map-query 
      nil
-     #'(lambda (cui pfstr cuilrl)
-        (funcall fn
-                 (make-instance 'ucon :cui (ensure-integer cui)
-                                :pfstr pfstr
-                                :lrl (ensure-integer cuilrl))))
+     #'(lambda (tuple)
+        (destructuring-bind (cui pfstr cuilrl) tuple
+          (funcall fn
+                   (make-instance 'ucon :cui (ensure-integer cui)
+                                  :pfstr pfstr
+                                  :lrl (ensure-integer cuilrl)))))
      (query-string mrcon (cui kpfstr kcuilrl) srl nil nil :order (cui asc)
                   :distinct t)
      :database db)))
@@ -438,13 +440,14 @@ is OBJNAME from TABLE where WHERE-NAME field = WHERE-VALUE with FIELDS"
     (with-sql-connection (db)
       (clsql:map-query 
        'list
-       #'(lambda (cui lui sui stt lrl pfstr)
-          (make-instance 'ustr :cui (ensure-integer cui)
-                         :lui (ensure-integer lui) :sui (ensure-integer sui)
-                         :stt stt :str pfstr
-                         :cuisui (make-cuisui (ensure-integer cui)
-                                              (ensure-integer sui))
-                         :lrl (ensure-integer lrl)))
+       #'(lambda (tuple)
+          (destructuring-bind (cui lui sui stt lrl pfstr) tuple
+            (make-instance 'ustr :cui (ensure-integer cui)
+                           :lui (ensure-integer lui) :sui (ensure-integer sui)
+                           :stt stt :str pfstr
+                           :cuisui (make-cuisui (ensure-integer cui)
+                                                (ensure-integer sui))
+                         :lrl (ensure-integer lrl))))
        (query-string mrcon (cui lui sui stt lrl kpfstr) srl nil nil :lrl lrl
                     :distinct t
                     :order (sui asc))

diff --git a/sql.lisp b/sql.lisp
index 19c58ed3117f039ac3ad69acffa39279ac812ba9..7b3c4a365e39cefea444702393510bc76a4b708b 100644 (file)
--- a/sql.lisp
+++ b/sql.lisp
@@ -19,10 +19,10 @@
 (in-package #:umlisp-orf)
 
 (defvar +umls-sql-map+
-    '((:2002AD . "KUMLS2002AD") (:2003AA . "KUMLS2003AA")
-      (:2003AB . "KUMLS2003AB") (:2003AC . "KUMLS2003AC")
-      (:2004AA . "KUMLS2004AA")))
-(defvar +default-umls-db+ :2003AC)
+    '((:2002ad . "KUMLS2002AD") (:2003aa . "KUMLS2003AA")
+      (:2003ab . "KUMLS2003AB") (:2003ac . "KUMLS2003AC")
+      (:2004aa . "KUMLS2004AA")))
+(defvar +default-umls-db+ :2003ac)
 
 
 (defun lookup-db-name (db)