r3662: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index 50c71396540a5db51b568270dda701bb35f01e6f..d5eaf78cee242e9c7dc8db4501dccec7a8d076b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cl-hyperobject (2.5.1-1) unstable; urgency=low
+
+  * Fix :ie-xml view categories
+  * Rework display of XML string data
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 26 Dec 2002 04:47:35 -0700
+
 cl-hyperobject (2.5.0-1) unstable; urgency=low
 
   * Reworked slot options, incompatible with previous version

diff --git a/views.lisp b/views.lisp
index f8b2649a76794daf026b73251610ca22ec8540c8..f4f075742d6156bb55f0af351f9cd5bd636b65e2 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2000
 ;;;;
-;;;; $Id: views.lisp,v 1.17 2002/12/24 06:30:29 kevin Exp $
+;;;; $Id: views.lisp,v 1.18 2002/12/26 11:57:15 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -184,10 +184,12 @@
       (let ((slot (find-slot-by-name obj-cl slot-name)))
        (unless slot
          (error "Slot ~A is not found in class ~S" slot-name obj-cl))
-       (let ((name (slot-definition-name slot))
-             (namestr-lower (string-downcase (symbol-name (slot-definition-name slot))))
-             (type (slot-value slot 'type))
-             (print-formatter (esd-print-formatter slot)))
+       (let* ((name (slot-definition-name slot))
+              (namestr-lower (string-downcase (symbol-name name)))
+              (xml-namestring (escape-xml-string namestr-lower))
+              (xml-tag (escape-xml-string namestr-lower))
+              (type (slot-value slot 'type))
+              (print-formatter (esd-print-formatter slot)))
 
          (cond
            (first-field
@@ -216,9 +218,9 @@
              (:html-labels
               (string-append fmtstr (concatenate 'string "<span class=\"label\">" namestr-lower "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>")))
              (:xhtml-labels
-              (string-append fmtstr (concatenate 'string "<span class=\"label\"><![CDATA[" namestr-lower "]]></span> <span class=\"" namestr-lower "\">" value-fmt "</span>")))
+              (string-append fmtstr (concatenate 'string "<span class=\"label\">" xml-namestr "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>")))
              (:xml-labels
-              (string-append fmtstr (concatenate 'string "<label><[!CDATA[" namestr-lower "]]></label> <" namestr-lower ">" value-fmt "</" namestr-lower ">")))
+              (string-append fmtstr (concatenate 'string "<label>" xml-namestr "</label> <" xml-tag ">" value-fmt "</" xml-tag ">")))
              ((or :html-link :xhtml-link)
               (push name links)
               (if (esd-hyperlink slot)
@@ -228,7 +230,7 @@
               (push name links)
               (if (esd-hyperlink slot)
                   (string-append fmtstr "<~~a>" value-fmt "</~~a>")
-                  (string-append fmtstr (concatenate 'string "<" namestr-lower ">" value-fmt "</" namestr-lower ">"))))
+                  (string-append fmtstr (concatenate 'string "<" xml-tag ">" value-fmt "</" xml-tag ">"))))
              (:html-link-labels
               (push name links)
               (if (esd-hyperlink slot)
@@ -237,13 +239,13 @@
              (:xhtml-link-labels
               (push name links)
               (if (esd-hyperlink slot)
-                  (string-append fmtstr "<span class=\"label\"><[!CDATA[" namestr-lower "]]></span> <~~a>" value-fmt "</~~a>")
-                  (string-append fmtstr (concatenate 'string "<span class=\"label\"><![CDATA[" namestr-lower "]]></span> <span class=\"" namestr-lower "\">" value-fmt "</span>"))))
+                  (string-append fmtstr "<span class=\"label\">" xml-namestr "</span> <~~a>" value-fmt "</~~a>")
+                  (string-append fmtstr (concatenate 'string "<span class=\"label\">" xml-namestr "</span> <span class=\"" namestr-lower "\">" value-fmt "</span>"))))
              ((or :xml-link-labels :ie-xml-link-labels)
               (push name links)
               (if (esd-hyperlink slot)
-                  (string-append fmtstr "<label><[![CDATA[" namestr-lower "]]></label> <~~a>" value-fmt "</~~a>")
-                  (string-append fmtstr (concatenate 'string "<label><![CDATA[" namestr-lower "]]></label> <" namestr-lower ">" value-fmt "</" namestr-lower ">")))))
+                  (string-append fmtstr "<label>" xml-namestr "></label> <~~a>" value-fmt "</~~a>")
+                  (string-append fmtstr (concatenate 'string "<label>" xml-namestr "</label> <" xml-tag ">" value-fmt "</" xml-tag ">")))))
            ) ;; let value-fmt
            
          (let ((func (if print-formatter