r3022: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 3f9903a3634e6b3f64e30191d5790dda16a12785..20eb04e6aa014dcaa230a2ae348060986db78fdb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-kmrcl (1.9-1) unstable; urgency=low
+
+  * ml-class.lisp: Get package name from object
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 14 Oct 2002 13:23:23 -0600
+

 cl-kmrcl (1.8-1) unstable; urgency=low
 
   * ml-class.lisp: Add defgeneric for generic functions
 cl-kmrcl (1.8-1) unstable; urgency=low
 
   * ml-class.lisp: Add defgeneric for generic functions

diff --git a/ml-class.lisp b/ml-class.lisp
index bab9ca619497c66de58c58edadb52e9aec4cbfeb..c42d2ae25884f46754add3288040090ce98ca71b 100644 (file)
--- a/ml-class.lisp
+++ b/ml-class.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;

-;;;; $Id: ml-class.lisp,v 1.10 2002/10/14 15:25:11 kevin Exp $
+;;;; $Id: ml-class.lisp,v 1.11 2002/10/14 19:26:36 kevin Exp $

 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
 ;;;;
 ;;;; This file, part of KMRCL, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;


@@ -154,6 +154,7 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
          (value-func '())
          (xmlvalue-func '())
          (classname (class-name cl))
          (value-func '())
          (xmlvalue-func '())
          (classname (class-name cl))

+         (package (symbol-package (class-name cl)))

          (ref-fields (slot-value cl 'ref-fields)))
       (declare (ignore classname))
       (dolist (f (slot-value cl 'fields))
          (ref-fields (slot-value cl 'ref-fields)))
       (declare (ignore classname))
       (dolist (f (slot-value cl 'fields))


@@ -215,11 +216,9 @@ Format is ((field-name field-lookup-func other-link-params) ...)")
          
          (if formatter
              (setq plain-value-func 
          
          (if formatter
              (setq plain-value-func 

-               (list `(,formatter (,(concat-symbol-pkg 
-                                     :umlisp namestr) x))))
+               (list `(,formatter (,(intern namestr package) x))))

            (setq plain-value-func 
            (setq plain-value-func 

-             (list `(,(concat-symbol-pkg 
-                       :umlisp namestr) x))))
+             (list `(,(intern namestr package) x))))

          (setq value-func (append value-func plain-value-func))
          
          (if (eql type :cdata)
          (setq value-func (append value-func plain-value-func))
          
          (if (eql type :cdata)