Changeset 739

Timestamp:

07/24/08 15:39:02 (4 months ago)

Author:

sylvain

Message:

Fixed purge events

Files:

• oss/headstock/headstock/api/pubsub.py (modified) (3 diffs)
• oss/headstock/headstock/protocol/extension/discovery.py (modified) (1 diff)
• oss/headstock/headstock/protocol/extension/pubsub.py (modified) (6 diffs)

oss/headstock/headstock/api/pubsub.py

@@ -52 +52 @@
-        self.event = eventType
-
+    @property
+    def name(self):
+        return self.id
+
-    def __repr__(self):
-        return '<Item "%s" at %s>' % (self.id or '', hex(id(self)),)
-    
+class Message(Entity):
+    def __init__(self, from_jid, to_jid):
+        Entity.__init__(self, from_jid, to_jid) 
+        self.node_name = None
+        self.items = []
+        self.event = None
+
+    @staticmethod
+    def from_element(e):
+        msg = Message(JID.parse(e.get_attribute_value('from')),
+                      JID.parse(e.get_attribute_value('to')))
+
+        for c in e.xml_children:
+            if c.xml_ns == XMPP_PUBSUB_EVENT_NS: # x or event
+                for i in c.xml_children:
+                    if i.xml_ns == XMPP_PUBSUB_EVENT_NS: # items
+                        msg.node_name = i.get_attribute_value('node')
+                        msg.event = i.xml_name
+                        if msg.event == 'items':
+                            for t in i.xml_children: # item
+                                payload = None
+                                if t.xml_children:
+                                    payload = t.xml_children
+                                msg.items.append(Item(id=t.get_attribute_value('id'),
+                                                      payload=payload, eventType=t.xml_name))
+
+        return msg
-
-class Node(Entity):
@@ -142 +173 @@
-
-        for i in e.xml_children:
-
-
-
-creat
-
+OWNER_
+
+OWNER_
+purg
+                                 
-            elif i.xml_ns == XMPP_CLIENT_NS and i.xml_name == 'error':
-                node.error = Error.from_element(i)
@@ -316 +347 @@
-        
-    
-class Message(Entity):
-    def __init__(self, from_jid, to_jid):
-        Entity.__init__(self, from_jid, to_jid) 
-        self.node_name = None
-        self.items = []
-
-    @staticmethod
-    def from_element(e):
-        msg = Message(JID.parse(e.get_attribute_value('from')),
-                      JID.parse(e.get_attribute_value('to')))
-
-        for c in e.xml_children:
-            if c.xml_ns == XMPP_PUBSUB_EVENT_NS: # x or event
-                for i in c.xml_children:
-                    if i.xml_ns == XMPP_PUBSUB_EVENT_NS: # items
-                        msg.node_name = i.get_attribute_value('node')
-                        for t in i.xml_children: # item
-                            payload = None
-                            if t.xml_children:
-                                payload = t.xml_children[0]
-                            msg.items.append(Item(id=t.get_attribute_value('id'),
-                                                  payload=payload, eventType=t.xml_name))
-
-        return msg

oss/headstock/headstock/protocol/extension/discovery.py

@@ -94 +94 @@
-                mes = self.recv("control")
-                
-
+
+
-                    self.send(producerFinished(), "signal")
-                    break

oss/headstock/headstock/protocol/extension/pubsub.py

@@ -274 +274 @@
-                mes = self.recv("control")
-                
-
+
+
-                    self.send(producerFinished(), "signal")
-                    break
@@ -287 +288 @@
-                e = a.xml_parent.xml_parent
-                self.send(('INCOMING', e), "log")
-
+
-                msg_type = e.get_attribute_value(u'type') or 'get'
-                key = 'xmpp.%s' % unicode(msg_type)
@@ -489 +490 @@
-                "unknown"      : "Unknown element that could not be dispatched properly",
-                "xmpp.message" : "Activity requests",
+                "xmpp.message.purge" : "Activity requests",
-                }
-    
@@ -510 +512 @@
-                e = a.xml_parent
-                self.send(('INCOMING', e), "log")
-
-
+
+
+
+
+
+
+
+
+
+
-            if not self.anyReady():
-                self.pause()
@@ -617 +627 @@
-                "out.retract.result"      : "Retract item responses",
-                "out.retract.error"       : "Retract item response error",
-
+
+
-    
-    def __init__(self):
@@ -762 +773 @@
-        self.link((self, 'message.inbox'), (msgdisp, 'inbox'), passthrough=1)
-        self.link((msgdisp, 'xmpp.message'), (self, 'out.message'), passthrough=2)
+        self.link((msgdisp, 'xmpp.message.purge'), (self, 'out.message.purge'), passthrough=2)
+        self.link((msgdisp, 'unknown'), (self, 'unknown'), passthrough=2)
-        self.link((msgdisp, 'log'), (self, 'log'), passthrough=2)
-        self.addChildren(msgdisp)