# HG changeset patch
# User Ralph Meijer <ralphm@ik.nu>
# Date 1207838030 0
# Node ID fc687620599b5937ab5557545da6ad26b8be089d
# Parent  42e23a62b57fc549cf69e4966c6e02b32850df2b
Properly add send_last_published_item configuration item.

diff -r 42e23a62b57f -r fc687620599b idavoll/backend.py
--- a/idavoll/backend.py	Thu Apr 10 14:06:00 2008 +0000
+++ b/idavoll/backend.py	Thu Apr 10 14:33:50 2008 +0000
@@ -35,10 +35,15 @@
                "pubsub#deliver_payloads":
                   {"type": "boolean",
                    "label": "Deliver payloads with event notifications"},
+               "pubsub#send_last_published_item":
+                  {"type": "list-single",
+                   "label": "When to send the last published item',
+                   "options": {'never', 'on_sub'},
               }
 
     default_config = {"pubsub#persist_items": True,
                       "pubsub#deliver_payloads": True,
+                      "pubsub#send_last_published_item": 'on_sub',
                      }
 
     def __init__(self, storage):
diff -r 42e23a62b57f -r fc687620599b idavoll/memory_storage.py
--- a/idavoll/memory_storage.py	Thu Apr 10 14:06:00 2008 +0000
+++ b/idavoll/memory_storage.py	Thu Apr 10 14:33:50 2008 +0000
@@ -10,7 +10,7 @@
 
 default_config = {"pubsub#persist_items": True,
                   "pubsub#deliver_payloads": True,
-                  "pubsub#send_last_published_item": True,
+                  "pubsub#send_last_published_item": 'on_sub',
                   "pubsub#node_type": "leaf"}
 
 class Storage:
diff -r 42e23a62b57f -r fc687620599b idavoll/pgsql_storage.py
--- a/idavoll/pgsql_storage.py	Thu Apr 10 14:06:00 2008 +0000
+++ b/idavoll/pgsql_storage.py	Thu Apr 10 14:33:50 2008 +0000
@@ -28,12 +28,16 @@
 
     def _get_node(self, cursor, node_id):
         configuration = {}
-        cursor.execute("""SELECT persistent, deliver_payload FROM nodes
+        cursor.execute("""SELECT persistent, deliver_payload,
+                                 send_last_published_item
+                          FROM nodes
                           WHERE node=%s""",
                        (node_id,))
         try:
             (configuration["pubsub#persist_items"],
-             configuration["pubsub#deliver_payloads"]) = cursor.fetchone()
+             configuration["pubsub#deliver_payloads"],
+             configuration["pubsub#send_last_published_item") = \
+            cursor.fetchone()
         except TypeError:
             raise error.NodeNotFound()
         else:
@@ -138,17 +142,19 @@
         for option in options:
             if option in config:
                 config[option] = options[option]
-        
+
         d = self._dbpool.runInteraction(self._set_configuration, config)
         d.addCallback(self._set_cached_configuration, config)
         return d
 
     def _set_configuration(self, cursor, config):
         self._check_node_exists(cursor)
-        cursor.execute("""UPDATE nodes SET persistent=%s, deliver_payload=%s
+        cursor.execute("""UPDATE nodes SET persistent=%s, deliver_payload=%s,
+                                           send_last_published_item=%s
                           WHERE node=%s""",
                        (config["pubsub#persist_items"],
                         config["pubsub#deliver_payloads"],
+                        config["pubsub#send_last_published_item"],
                         self.id))
 
     def _set_cached_configuration(self, void, config):
@@ -300,7 +306,7 @@
                           WHERE node=%s""",
                        self.id)
         result = cursor.fetchall()
-        
+
         return [(jid.internJID(r[0]), r[1]) for r in result]
 
 class LeafNodeMixin:
@@ -340,7 +346,7 @@
 
     def _remove_items(self, cursor, item_ids):
         self._check_node_exists(cursor)
-        
+
         deleted = []
 
         for item_id in item_ids: