# HG changeset patch
# User Ralph Meijer <ralphm@ik.nu>
# Date 1100015843 0
# Node ID f3f31aa491df5e582316d8af4e34204160c680a6
# Parent  758cb81b97ceb10c277b32b2d8ae6717d4531eeb
Fix handling of node creation.
Announce pubsub#retrieve-items disco feature in
ComponentServiceFromItemRetrievalService.

diff -r 758cb81b97ce -r f3f31aa491df idavoll/pubsub.py
--- a/idavoll/pubsub.py	Tue Nov 09 14:54:17 2004 +0000
+++ b/idavoll/pubsub.py	Tue Nov 09 15:57:23 2004 +0000
@@ -304,10 +304,11 @@
         return d
 
     def return_create_response(self, result, iq):
-        if iq.pubsub.create["node"] is None:
+        node_id = iq.pubsub.create.getAttribute("node")
+        if not node_id or node_id != result:
             reply = domish.Element((NS_PUBSUB, 'pubsub'))
             entity = reply.addElement('create')
-            entity['node'] = result['node_id']
+            entity['node'] = result
             return [reply]
 
     def onConfigureGet(self, iq):
@@ -355,6 +356,14 @@
     def componentConnected(self, xmlstream):
         xmlstream.addObserver(PUBSUB_ITEMS, self.onItems)
 
+    def get_disco_info(self, node):
+        info = []
+
+        if not node:
+            info.append(disco.Feature(NS_PUBSUB + "#retrieve-items"))
+
+        return defer.succeed(info)
+
     def onItems(self, iq):
         self.handler_wrapper(self._onItems, iq)