From d1954a463a0e58cffdd2d27ba253763d0b5d9c7e Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 28 May 2004 04:26:36 +0000
Subject: [PATCH] r9497: finish original orf package

---
 composite.lisp   |  2 +-
 package.lisp     |  4 ++--
 sql-classes.lisp | 35 +++++++++++++++++++----------------
 sql.lisp         |  8 ++++----
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/composite.lisp b/composite.lisp
index d7b366e..d3e29a7 100644
--- 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 8565026..283cd9e 100644
--- 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 13727ba..70efa92 100644
--- 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 19c58ed..7b3c4a3 100644
--- 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)
-- 
2.34.1