tmp (wokkel): fixes RSM implementation to fit sat_pubsub answer when in "unrestricted" mode
This commit is contained in:
parent
b344feb420
commit
af2014df91
2 changed files with 10 additions and 4 deletions
|
|
@ -1408,6 +1408,9 @@ class PubSubService(XMPPHandler, IQHandlerMixin):
|
||||||
items["node"] = request.nodeIdentifier
|
items["node"] = request.nodeIdentifier
|
||||||
|
|
||||||
for item in result:
|
for item in result:
|
||||||
|
if isinstance(item, tuple):
|
||||||
|
# XXX: see sat_pubsub.pgsql_storage.LeafNode.getItemsById return value
|
||||||
|
item = item[0]
|
||||||
if item.name == 'item':
|
if item.name == 'item':
|
||||||
item.uri = NS_PUBSUB
|
item.uri = NS_PUBSUB
|
||||||
items.addChild(item)
|
items.addChild(item)
|
||||||
|
|
|
||||||
|
|
@ -368,9 +368,12 @@ class PubSubService(pubsub.PubSubService):
|
||||||
def _toResponse_items(self, result, resource, request):
|
def _toResponse_items(self, result, resource, request):
|
||||||
response = pubsub.PubSubService._toResponse_items(self, result,
|
response = pubsub.PubSubService._toResponse_items(self, result,
|
||||||
resource, request)
|
resource, request)
|
||||||
set_elts = [elt for elt in result if elt.name == 'set']
|
for item in result:
|
||||||
if set_elts:
|
if isinstance(item, tuple):
|
||||||
assert len(set_elts) == 1
|
# XXX: see sat_pubsub.pgsql_storage.LeafNode.getItemsById return value
|
||||||
response.addChild(set_elts[0])
|
item = item[0]
|
||||||
|
if item.name == set:
|
||||||
|
response.addChild(item)
|
||||||
|
break
|
||||||
|
|
||||||
return response
|
return response
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue