# HG changeset patch
# User Ralph Meijer <ralphm@ik.nu>
# Date 1099779525 0
# Node ID a3d67cbab9c4ca26436f48c4ec5cd4b22f3d4dd9
# Parent  cdf17c4d3bf9923a8da7e09766708e0d74812ed0
Return deferreds from getFeatures() and getIdentities().
Find out if a node exists for getIdentities(), and return its type.

diff -r cdf17c4d3bf9 -r a3d67cbab9c4 idavoll/pubsub.py
--- a/idavoll/pubsub.py	Sat Nov 06 22:17:18 2004 +0000
+++ b/idavoll/pubsub.py	Sat Nov 06 22:18:45 2004 +0000
@@ -114,14 +114,15 @@
 class ComponentServiceFromService(Service):
 
     def getIdentities(self, node):
-        results = []
-        if not node:
-            results.append({
-                'category': 'pubsub',
-                'type': 'generic',
-                'name': 'Generic Pubsub Service'
-            })
-        return results
+        if node:
+            d = self.backend.get_node_type(node)
+            d.addCallback(lambda x: [{'category': 'pubsub', 'type': x}])
+            d.addErrback(lambda x: [])
+            return d
+        else:
+            return defer.succeed({'category': 'pubsub',
+                                  'type': 'generic',
+                                  'name': 'Generic Pubsub Service'})
 
     def getFeatures(self, node):
         features = []
@@ -136,7 +137,7 @@
             if self.backend.supports_persistent_items():
                 features.append(NS_PUBSUB + "#persistent-items")
 
-        return features
+        return defer.succeed(features)
 
 components.registerAdapter(ComponentServiceFromService, backend.IBackendService, component.IService)
 
@@ -205,7 +206,7 @@
         if not node:
             features.append(NS_PUBSUB + "#subscribe")
 
-        return features
+        return defer.succeed(features)
 
     def onSubscribe(self, iq):
         self.handler_wrapper(self._onSubscribe, iq)
@@ -263,6 +264,11 @@
 
 class ComponentServiceFromNodeCreationService(Service):
 
+    def componentConnected(self, xmlstream):
+        xmlstream.addObserver(PUBSUB_CREATE, self.onCreate)
+        xmlstream.addObserver(PUBSUB_CONFIGURE_GET, self.onConfigureGet)
+        xmlstream.addObserver(PUBSUB_CONFIGURE_SET, self.onConfigureSet)
+
     def getFeatures(self, node):
         features = []
 
@@ -272,12 +278,7 @@
             if self.backend.supports_instant_nodes():
                 features.append(NS_PUBSUB + "#instant-nodes")
 
-        return features
-
-    def componentConnected(self, xmlstream):
-        xmlstream.addObserver(PUBSUB_CREATE, self.onCreate)
-        xmlstream.addObserver(PUBSUB_CONFIGURE_GET, self.onConfigureGet)
-        xmlstream.addObserver(PUBSUB_CONFIGURE_SET, self.onConfigureSet)
+        return defer.succeed(features)
 
     def onCreate(self, iq):
         self.handler_wrapper(self._onCreate, iq)