r9605: properly display xml object when it does not have any subobjects

diff --git a/debian/changelog b/debian/changelog
index baf8d69c74b85648ce1405fb523cdde9197d0103..711bf87c9d58a6eaf31e0820446016e624ecd23f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+cl-hyperobject (2.9.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sun, 13 Jun 2004 13:26:35 -0700
+
 cl-hyperobject (2.8.8-1) unstable; urgency=low
 
   * Change encoding to ISO-8859-1
 
  -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 20 Nov 2003 20:40:18 -0700
-
+       
 cl-hyperobject (2.8.7-1) unstable; urgency=low
 
   * Fix invalid setting of documentation for hyperobject-class

diff --git a/views.lisp b/views.lisp
index b8074830479fe8f40096c7fc3cae324858ced219..8d43e6995ac21af847bb9fa4d7df8d7f9fd38b20 100644 (file)
--- a/views.lisp
+++ b/views.lisp
@@ -363,7 +363,7 @@
   (unless (slots view) (setf (slots view) (default-print-slots obj-cl)))
 
   (let ((links '())
-       (print-func (make-array 10 :fill-pointer 0 :adjustable t)))
+       (print-func (make-array 20 :fill-pointer 0 :adjustable t)))
 
     (do* ((slots (slots view) (cdr slots))
          (slot-name (car slots) (car slots))
@@ -589,6 +589,7 @@
     (setf (list-end-printer view) #'xmlformat-list-end-func)
     (setf (obj-start-printer view) (format nil "<~(~a~)>" name))
     (setf (obj-start-indent view) t)
+    (setf (obj-end-printer view) (format nil "</~(~a~)>~%" name))
     (setf (subobj-end-printer view) (format nil "</~(~a~)>~%" name))
     (setf (subobj-end-indent view) nil)
     (setf (obj-data-indent view) nil)))
@@ -771,11 +772,13 @@
          (fmt-obj-start obj view strm indent)
          (fmt-obj-data obj view strm (1+ indent) refvars link-printer)
          (fmt-obj-end obj view strm indent)
-         (when subobjects 
-           (fmt-subobj-start obj view strm indent)
-           (view-subobjects obj strm vid indent filter subobjects
-                            refvars link-printer)
-           (fmt-subobj-end obj view strm indent))))
+         (if subobjects 
+             (progn
+               (fmt-subobj-start obj view strm indent)
+               (view-subobjects obj strm vid indent filter subobjects
+                                refvars link-printer)
+               (fmt-subobj-end obj view strm indent))
+           (fmt-subobj-start obj view strm indent))))
       (fmt-list-end (car objlist) view strm indent nobjs)))
   objs)