Changeset 754

Timestamp:

07/31/08 10:24:51 (4 months ago)

Author:

sylvain

Message:

Some pubsub retrieval items addon

Files:

• oss/jlib/examples/basic/client.py (modified) (2 diffs)
• oss/jlib/jlib/core/pubsub.py (modified) (12 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (1 diff)

oss/jlib/examples/basic/client.py

@@ -138 +138 @@
-        QtCore.QObject.connect(disco, QtCore.SIGNAL("receivedItems(PyQt_PyObject)"),
-                               self.setItemsModel)
+        QtCore.QObject.connect(disco, QtCore.SIGNAL("receivedInformation(PyQt_PyObject)"),
+                               self.setNodeInformation)
-
-        QtCore.QObject.connect(self.connection.qobj.pubsubnode, QtCore.SIGNAL("retrievedItems(PyQt_PyObject)"),
@@ -164 +166 @@
-        model = self.nodesUi.model()
-        model.setNodeItems(items)
+
+        disco = self.connection.qobj.discovery
+        for item in items.items:
+            print item.node
+            disco.emit(QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"), item.node)
+
+
+    def setNodeInformation(self, info):
+        print info
-
-    def displayPubSubItems(self, message):

oss/jlib/jlib/core/pubsub.py

@@ -37 +37 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("discoverItems(PyQt_PyObject)"), self.discoverItems)
-        QtCore.QObject.connect(self, QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"), self.discoverNodeInfo)
-
+    
-    def setComponent(self, component):
-        QAxonObject.setComponent(self, component)
@@ -58 +58 @@
-                    ("discodisp",'out.subscription.result'): ('discohandler','subscriptions.result'),
-                    ("discodisp",'out.subscription.error'): ('discohandler','subscriptions.error'),
+                    ("discodisp",'out.info.result'): ('discohandler','information.result'),
-                    ("discodisp",'out.info.error'): ('discohandler','information.error'),
-                    ("discodisp",'out.affiliation.result'): ('discohandler','affiliations.result'),
@@ -192 +193 @@
-                self.qobj.emit(QtCore.SIGNAL("receivedSubscriptionError(PyQt_PyObject)"), subscriptions)
-                
+            if self.dataReady('information.result'):
+                info = self.recv('information.result')
+                self.qobj.emit(QtCore.SIGNAL("receivedInformation(PyQt_PyObject)"), info)
+                
-            if self.dataReady('information.error'):
-                info = self.recv('information.error')
@@ -379 +384 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("deleteItem(PyQt_PyObject, PyQt_PyObject)"), self.deleteItem)
-        QtCore.QObject.connect(self, QtCore.SIGNAL("retrieveItem(PyQt_PyObject, PyQt_PyObject)"), self.retrieveItem)     
+        QtCore.QObject.connect(self, QtCore.SIGNAL("retrieveItems(PyQt_PyObject)"), self.fetchItems)
-        QtCore.QObject.connect(self, QtCore.SIGNAL("purgeCollectionNode(PyQt_PyObject)"), self.purgeCollectionNode) 
-
@@ -400 +406 @@
-                    ("itemshandler", "delete-node"): ("pubsubdisp", "delete.forward"),
-                    ("itemshandler", "retrieve-item"): ("pubsubdisp", "retrieve.forward"),
+                    ("itemshandler", "retrieve-all-items"): ("pubsubdisp", "retrieve.all.forward"),
-                    ("itemshandler", "subscribe-node"): ("pubsubdisp", "subscribe.forward"),
-                    ("itemshandler", "unsubscribe-node"): ("pubsubdisp", "unsubscribe.forward"),
@@ -406 +413 @@
-                    ('itemshandler', 'purge-collection-node'): ('pubsubdisp', 'purge.forward'),
-                    ("pubsubdisp", "retrieve.outbox"): ("xmpp", "forward"),
+                    ("pubsubdisp", "retrieve.all.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "create.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "delete.outbox"): ("xmpp", "forward"),
@@ -416 +424 @@
-                    ("pubsubdisp", "out.message.purge"): ('itemshandler', 'purged'),
-                    ("pubsubdisp", "out.retrieve.result"): ("itemshandler", "retrieved"),
+                    ("pubsubdisp", "out.retrieve.all.result"): ("itemshandler", "retrieved"),
-                    ("pubsubdisp", "out.create.result"): ("itemshandler", "created"),
-                    ("pubsubdisp", "out.subscribe.result"): ("itemshandler", "subscribed"),
-                    ("pubsubdisp", "out.delete.result"): ("itemshandler", "deleted"),
-                    ("pubsubdisp", "out.retrieve.error"): ("itemshandler", "error"),
+                    ("pubsubdisp", "out.retrieve.all.error"): ("itemshandler", "error"),
-                    ("pubsubdisp", "out.create.error"): ("itemshandler", "error"),
-                    ("pubsubdisp", "out.delete.error"): ("itemshandler", "error"),
@@ -454 +464 @@
-    def retrieveItem(self, node_id, item_id):
-        self._deliver((node_id, item_id), 'request-item')
+
+    def fetchItems(self, node_id):
+        self._deliver(node_id, 'request-all-items')
-
-class jlibPubSubNodeComponent(component):
@@ -468 +481 @@
-               "request-delete-item":     "",
-               "request-item": "",
+               "request-all-items": "",
-               "request-purge-collection-node": "",
-               
@@ -489 +503 @@
-                "delete-item"  : "",
-                "retrieve-item": "",
+                "retrieve-all-items": "",
-                "purge-collection-node": "",
-                "subscribe-node"   : "",
@@ -538 +553 @@
-                         node_name=node_id, item=Item(id=item_id))
-                self.send(p, "retrieve-item")
+
+            if self.dataReady('request-all-items'):
+                node_id = self.recv('request-all-items')
+                p = Node(unicode(self.from_jid), self.pubsub_service, type=u"get",
+                         node_name=node_id)
+                self.send(p, "retrieve-all-items")
-
-            if self.dataReady('request-publish-item'):
@@ -646 +667 @@
-        self.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Item ID"))
-        self.items = {}
-
+
-    def flags(self, index):
-        return QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled

oss/jlib/jlib/gui/pubsub/node.py

@@ -81 +81 @@
-        self.pubsub.emit(QtCore.SIGNAL("deleteItem(PyQt_PyObject, PyQt_PyObject)"),
-                         item.item.node, item.item.name)
-
+
-    def purgeNode(self):
-        model = self.nodes.model()