Changeset 722

Timestamp:

07/21/08 01:06:44 (4 months ago)

Author:

sylvain

Message:

Added node item retrieval component

Files:

• oss/headstock/headstock/protocol/extension/pubsub.py (modified) (12 diffs)

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

@@ -13 +13 @@
-           'ItemPublicationDispatcher', 'ItemDeletionDispatcher',
-           'MessageEventDispatcher', 'NodePurgeDispatcher',
-
+, 'ItemRetrievalDispatcher'
-
-class SubscriptionDispatcher(component):
@@ -305 +305 @@
-        yield 1
-
-Publication
+Retrieval
-    
-    Inboxes = {"inbox"              : "bridge.Element instance",
-               "control"            : "Shutdown the client stream",
-headstock.api.contact.Message instance to be sent back to the client. Transforms the instance to a bridge.Element instance and puts it into the 'outbox'
+
-               }
-    
@@ -323 +323 @@
-    
-    def __init__(self):
-Publication
+Retrieval
-
-    def main(self):
@@ -338 +338 @@
-            if self.dataReady("forward"):
-                s = self.recv("forward")
-publication_element
+request_item
-
-            if self.dataReady("inbox"):
@@ -350 +350 @@
-
-                if key in self.outboxes:
-publication_element
+request_item
-                    handled = True
-
@@ -363 +363 @@
-        yield 1
-
-Dele
+Publica
-    
-    Inboxes = {"inbox"              : "bridge.Element instance",
@@ -381 +381 @@
-    
-    def __init__(self):
+       super(ItemPublicationDispatcher, self).__init__() 
+
+    def main(self):
+        yield 1
+
+        while 1:
+            if self.dataReady("control"):
+                mes = self.recv("control")
+                
+                if isinstance(mes, shutdownMicroprocess) or isinstance(mes, producerFinished):
+                    self.send(producerFinished(), "signal")
+                    break
+
+            if self.dataReady("forward"):
+                s = self.recv("forward")
+                self.send(Node.to_publication_element(s), "outbox")
+
+            if self.dataReady("inbox"):
+                handled = False
+                a = self.recv("inbox")
+                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)
+
+                if key in self.outboxes:
+                    self.send(Node.from_publication_element(e), key)
+                    handled = True
+
+                if not handled:
+                    self.send(e, "unknown")
+                    
+            if not self.anyReady():
+                self.pause()
+  
+            yield 1
+
+        yield 1
+
+class ItemDeletionDispatcher(component):
+    
+    Inboxes = {"inbox"              : "bridge.Element instance",
+               "control"            : "Shutdown the client stream",
+               "forward"            : "headstock.api.contact.Message instance to be sent back to the client. Transforms the instance to a bridge.Element instance and puts it into the 'outbox'",
+               }
+    
+    Outboxes = {"outbox"       : "bridge.Element instance",
+                "signal"       : "Shutdown signal",
+                "log"          : "log",
+                "unknown"      : "Unknown element that could not be dispatched properly",
+                "xmpp.get"     : "Activity requests",
+                "xmpp.set"     : "Activity responses",
+                "xmpp.result"  : "Activity responses",
+                "xmpp.error"   : "Activity response error",
+                }
+    
+    def __init__(self):
-       super(ItemDeletionDispatcher, self).__init__() 
-
@@ -464 +522 @@
-    Inboxes = {"inbox"               : "bridge.Element instance",
-               "control"             : "Shutdown the client stream",
+               "retrieve.inbox"        : "",
+               "retrieve.forward"      : "",
-               "create.inbox"        : "",
-               "create.forward"      : "",
@@ -479 +539 @@
-               "retract.forward"     : "",
-               "message.inbox"       : "",
+               "in.retrieve.error"        : "Retrieve items response error",
+               "in.retrieve.get"          : "Retrieve items requests",
+               "in.retrieve.set"          : "Retrieve items responses",
+               "in.retrieve.result"       : "Retrieve items responses",
-               "in.create.error"        : "Publish items response error",
-               "in.create.get"          : "Publish items requests",
@@ -512 +576 @@
-                "unknown"                 : "Unknown element that could not be dispatched properly",
-                "log"                     : "log",
+                "retrieve.outbox"           : "",
-                "create.outbox"           : "",
-                "purge.outbox"            : "",
@@ -520 +585 @@
-                "retract.outbox"          : "",
-                "message.outbox"          : "",
+                "out.retrieve.error"       : "Retrieve items responses",
+                "out.retrieve.get"          : "Retrieve items requests",
+                "out.retrieve.set"          : "Retrieve items responses",
+                "out.retrieve.result"       : "Retrieve items responses",
-                "out.create.get"          : "Publish items requests",
-                "out.create.set"          : "Publish items responses",
@@ -639 +708 @@
-        nodedeletedisp.activate()
-
+        itemretrievedisp = ItemRetrievalDispatcher()
+        self.link((self, 'retrieve.inbox'), (itemretrievedisp, 'inbox'), passthrough=1)
+        self.link((self, 'retrieve.forward'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.get'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.set'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.result'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((self, 'in.retrieve.error'), (itemretrievedisp, 'forward'), passthrough=1)
+        self.link((itemretrievedisp, 'outbox'), (self, 'retrieve.outbox'), passthrough=2)
+        self.link((itemretrievedisp, 'xmpp.get'), (self, 'out.retrieve.get'), passthrough=2)
+        self.link((itemretrievedisp, 'xmpp.set'), (self, 'out.retrieve.set'), passthrough=2)
+        self.link((itemretrievedisp, 'xmpp.result'), (self, 'out.retrieve.result'), passthrough=2)
+        self.link((itemretrievedisp, 'xmpp.error'), (self, 'out.retrieve.error'), passthrough=2)
+        self.link((itemretrievedisp, 'unknown'), (self, 'unknown'), passthrough=2)
+        self.link((itemretrievedisp, 'log'), (self, 'log'), passthrough=2)
+        self.addChildren(itemretrievedisp)
+        itemretrievedisp.activate()
+
-        itempublishdisp = ItemPublicationDispatcher()
-        self.link((self, 'publish.inbox'), (itempublishdisp, 'inbox'), passthrough=1)