From 6483275c5678db10d055371227be795cdc63db38 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 22 Feb 2013 15:04:37 -0800 Subject: rgw: set attrs on various list bucket xml results (swift) Fixes: #4247 The list buckets operation was missing some attrs on the different xml result entities. This fixes it. Signed-off-by: Yehuda Sadeh (cherry picked from commit 2b2704180a12153dc692dd0902515101502a85ba) --- src/rgw/rgw_rest_swift.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc index 34a73633f9a..40712e28164 100644 --- a/src/rgw/rgw_rest_swift.cc +++ b/src/rgw/rgw_rest_swift.cc @@ -112,7 +112,7 @@ void RGWListBucket_ObjStore_SWIFT::send_response() dump_start(s); - s->formatter->open_array_section("container"); + s->formatter->open_array_section_with_attrs("container", FormatterAttrs("name", s->bucket.name.c_str(), NULL)); while (iter != objs.end() || pref_iter != common_prefixes.end()) { bool do_pref = false; @@ -158,15 +158,15 @@ void RGWListBucket_ObjStore_SWIFT::send_response() if (name.compare(delimiter) == 0) goto next; - s->formatter->open_object_section("subdir"); + s->formatter->open_object_section_with_attrs("subdir", FormatterAttrs("name", name.c_str(), NULL)); /* swift is a bit inconsistent here */ switch (s->format) { case RGW_FORMAT_XML: - s->formatter->dump_string("name", pref_iter->first); + s->formatter->dump_string("name", name); break; default: - s->formatter->dump_string("subdir", pref_iter->first); + s->formatter->dump_string("subdir", name); } s->formatter->close_section(); } -- cgit v1.2.1