Changeset 723

Timestamp:

07/21/08 01:07:30 (4 months ago)

Author:

sylvain

Message:

Added node item retrieval API

Files:

• oss/headstock/headstock/api/discovery.py (modified) (2 diffs)
• oss/headstock/headstock/api/pubsub.py (modified) (1 diff)

oss/headstock/headstock/api/discovery.py

@@ -154 +154 @@
-                            item = Item(jid, i.get_attribute_value('action'),
-                                        i.get_attribute_value('name'),
-i.get_attribute_value('node')
+disco.node_name
-                            disco.items.append(item)
-            elif c.xml_ns == XMPP_CLIENT_NS and c.xml_name == 'error':
@@ -193 +193 @@
-                    if not isinstance(p, E):
-                        continue
-   
+
-                        for s in p.xml_children:                    
-                            if not isinstance(s, E):

oss/headstock/headstock/api/pubsub.py

@@ -272 +272 @@
-                                if q.xml_name == 'item':
-                                    node.item = Item(q.get_attribute_value('id'))                                    
+            elif i.xml_ns == XMPP_CLIENT_NS and i.xml_name == 'error':
+                node.error = Error.from_element(i)
+
+        return node
+        
+    @staticmethod
+    def to_request_item(e):
+        iq = Entity.to_element(e)
+        pubsub = E(u'pubsub', namespace=XMPP_PUBSUB_NS, parent=iq)
+        attrs = {u'node': e.node_name}
+        items = E(u'items', attributes=attrs, namespace=XMPP_PUBSUB_NS, parent=pubsub)
+        attrs = {u'id': e.item.id}
+        item = E(u'item', attributes=attrs, namespace=XMPP_PUBSUB_NS, parent=items)
+
+        return iq
+
+    @staticmethod
+    def from_request_item(e):
+        node = Node(JID.parse(e.get_attribute_value('from')),
+                    JID.parse(e.get_attribute_value('to')),
+                    type=e.get_attribute_value('type'),
+                    stanza_id=e.get_attribute_value('id'))
+
+        for i in e.xml_children:
+            if i.xml_ns in [XMPP_PUBSUB_NS]:
+                for p in i.xml_children:
+                    if p.xml_ns in [XMPP_PUBSUB_NS]:
+                        if p.xml_name == 'items':
+                            node.node_name = p.get_attribute_value('node')
+                            for q in p.xml_children:
+                                if q.xml_name == 'item':
+                                    payload = None
+                                    if q.xml_children: payload = q.xml_children
+                                    node.item = Item(q.get_attribute_value('id'),
+                                                     payload=payload)                                    
-            elif i.xml_ns == XMPP_CLIENT_NS and i.xml_name == 'error':
-                node.error = Error.from_element(i)