From 7bca13c10f4aee6affb132b7016a693dee9116c9 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 13 Jun 2004 19:49:18 +0000 Subject: [PATCH] r9605: properly display xml object when it does not have any subobjects --- debian/changelog | 8 +++++++- views.lisp | 15 +++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index baf8d69..711bf87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ +cl-hyperobject (2.9.0-1) unstable; urgency=low + + * New upstream + + -- Kevin M. Rosenberg 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 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 b807483..8d43e69 100644 --- 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 "~%" name)) (setf (subobj-end-printer view) (format nil "~%" 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) -- 2.34.1