Mercurial > libervia-backend
changeset 1510:91631837ce5c
tmp (wokkel): fixes RSM implementation to fit sat_pubsub answer when in "unrestricted" mode
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Thu, 10 Sep 2015 07:33:13 +0200 |
| parents | 72e6ee3fdf53 |
| children | 83f71763e1a7 |
| files | src/tmp/wokkel/pubsub.py src/tmp/wokkel/rsm.py |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tmp/wokkel/pubsub.py Wed Sep 02 14:59:28 2015 +0200 +++ b/src/tmp/wokkel/pubsub.py Thu Sep 10 07:33:13 2015 +0200 @@ -1408,6 +1408,9 @@ items["node"] = request.nodeIdentifier 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': item.uri = NS_PUBSUB items.addChild(item)
--- a/src/tmp/wokkel/rsm.py Wed Sep 02 14:59:28 2015 +0200 +++ b/src/tmp/wokkel/rsm.py Thu Sep 10 07:33:13 2015 +0200 @@ -368,9 +368,12 @@ def _toResponse_items(self, result, resource, request): response = pubsub.PubSubService._toResponse_items(self, result, resource, request) - set_elts = [elt for elt in result if elt.name == 'set'] - if set_elts: - assert len(set_elts) == 1 - response.addChild(set_elts[0]) + for item in result: + if isinstance(item, tuple): + # XXX: see sat_pubsub.pgsql_storage.LeafNode.getItemsById return value + item = item[0] + if item.name == set: + response.addChild(item) + break return response