libervia-pubsub: idavoll/pgsql

annotate idavoll/pgsql_storage.py @ 202:77c61e2b8c75

Use `domish.Element`s to represent items, instead of serialized XML.

author	Ralph Meijer <ralphm@ik.nu>
date	Wed, 25 Jun 2008 12:27:55 +0000
parents	e404775b12df
children	b4bf0a5ce50d

rev	line source
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 170 diff changeset	1 # Copyright (c) 2003-2008 Ralph Meijer
155 5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	2 # See LICENSE for details.
5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	3
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	4 import copy
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	5
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	6 from zope.interface import implements
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	7
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	8 from twisted.enterprise import adbapi
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	9 from twisted.words.protocols.jabber import jid
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	10
77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	11 from wokkel.generic import parseXml
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	12
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	13 from idavoll import error, iidavoll
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	14
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	15 class Storage:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	16
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	17 implements(iidavoll.IStorage)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	18
170 958e69630e52 Provide twistd parameters for connecting to a remote PostgreSQL database. Ralph Meijer <ralphm@ik.nu> parents: 167 diff changeset	19 def __init__(self, user, database, password=None, host=None, port=None):
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	20 self._dbpool = adbapi.ConnectionPool('pyPgSQL.PgSQL',
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	21 user=user,
163 1701c0e2c707 Add --dbpass option for passing a password to the PostgreSQL backend. Ralph Meijer <ralphm@ik.nu> parents: 155 diff changeset	22 password=password,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	23 database=database,
170 958e69630e52 Provide twistd parameters for connecting to a remote PostgreSQL database. Ralph Meijer <ralphm@ik.nu> parents: 167 diff changeset	24 host=host,
958e69630e52 Provide twistd parameters for connecting to a remote PostgreSQL database. Ralph Meijer <ralphm@ik.nu> parents: 167 diff changeset	25 port=port,
958e69630e52 Provide twistd parameters for connecting to a remote PostgreSQL database. Ralph Meijer <ralphm@ik.nu> parents: 167 diff changeset	26 cp_reconnect=True,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	27 client_encoding='utf-8'
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	28 )
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	29
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	30
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	31 def getNode(self, nodeIdentifier):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	32 return self._dbpool.runInteraction(self._getNode, nodeIdentifier)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	33
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	34
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	35 def _getNode(self, cursor, nodeIdentifier):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	36 configuration = {}
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	37 cursor.execute("""SELECT persistent, deliver_payload,
fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	38 send_last_published_item
fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	39 FROM nodes
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	40 WHERE node=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	41 (nodeIdentifier,))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	42 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	43 (configuration["pubsub#persist_items"],
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	44 configuration["pubsub#deliver_payloads"],
181 0d4474051eeb Typos Ralph Meijer <ralphm@ik.nu> parents: 180 diff changeset	45 configuration["pubsub#send_last_published_item"]) = \
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	46 cursor.fetchone()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	47 except TypeError:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	48 raise error.NodeNotFound()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	49 else:
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	50 node = LeafNode(nodeIdentifier, configuration)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	51 node._dbpool = self._dbpool
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	52 return node
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	53
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	54
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	55 def getNodeIds(self):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	56 d = self._dbpool.runQuery("""SELECT node from nodes""")
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	57 d.addCallback(lambda results: [r[0] for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	58 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	59
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	60
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	61 def createNode(self, nodeIdentifier, owner, config=None):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	62 return self._dbpool.runInteraction(self._createNode, nodeIdentifier,
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	63 owner)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	64
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	65
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	66 def _createNode(self, cursor, nodeIdentifier, owner):
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	67 owner = owner.userhost()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	68 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	69 cursor.execute("""INSERT INTO nodes (node) VALUES (%s)""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	70 (nodeIdentifier))
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	71 except cursor._pool.dbapi.OperationalError:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	72 raise error.NodeExists()
ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	73
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	74 cursor.execute("""SELECT 1 from entities where jid=%s""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	75 (owner))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	76
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	77 if not cursor.fetchone():
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	78 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	79 (owner))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	80
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	81 cursor.execute("""INSERT INTO affiliations
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	82 (node_id, entity_id, affiliation)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	83 SELECT n.id, e.id, 'owner' FROM
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	84 (SELECT id FROM nodes WHERE node=%s) AS n
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	85 CROSS JOIN
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	86 (SELECT id FROM entities WHERE jid=%s) AS e""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	87 (nodeIdentifier, owner))
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	88
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	89
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	90 def deleteNode(self, nodeIdentifier):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	91 return self._dbpool.runInteraction(self._deleteNode, nodeIdentifier)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	92
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	93
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	94 def _deleteNode(self, cursor, nodeIdentifier):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	95 cursor.execute("""DELETE FROM nodes WHERE node=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	96 (nodeIdentifier,))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	97
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	98 if cursor.rowcount != 1:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	99 raise error.NodeNotFound()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	100
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	101
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	102 def getAffiliations(self, entity):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	103 d = self._dbpool.runQuery("""SELECT node, affiliation FROM entities
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	104 JOIN affiliations ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	105 (affiliations.entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	106 JOIN nodes ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	107 (nodes.id=affiliations.node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	108 WHERE jid=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	109 (entity.userhost(),))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	110 d.addCallback(lambda results: [tuple(r) for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	111 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	112
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	113
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	114 def getSubscriptions(self, entity):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	115 d = self._dbpool.runQuery("""SELECT node, jid, resource, subscription
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	116 FROM entities JOIN subscriptions ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	117 (subscriptions.entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	118 JOIN nodes ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	119 (nodes.id=subscriptions.node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	120 WHERE jid=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	121 (entity.userhost(),))
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	122 d.addCallback(self._convertSubscriptionJIDs)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	123 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	124
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	125
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	126 def _convertSubscriptionJIDs(self, subscriptions):
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	127 return [(node,
b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	128 jid.internJID('%s/%s' % (subscriber, resource)),
b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	129 subscription)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	130 for node, subscriber, resource, subscription in subscriptions]
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	131
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 170 diff changeset	132
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	133
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	134 class Node:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	135
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	136 implements(iidavoll.INode)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	137
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	138 def __init__(self, nodeIdentifier, config):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	139 self.nodeIdentifier = nodeIdentifier
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	140 self._config = config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	141
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	142
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	143 def _checkNodeExists(self, cursor):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	144 cursor.execute("""SELECT id FROM nodes WHERE node=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	145 (self.nodeIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	146 if not cursor.fetchone():
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	147 raise error.NodeNotFound()
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	148
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	149
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	150 def getType(self):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	151 return self.nodeType
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	152
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	153
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	154 def getConfiguration(self):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	155 return self._config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	156
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	157
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	158 def setConfiguration(self, options):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	159 config = copy.copy(self._config)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	160
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	161 for option in options:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	162 if option in config:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	163 config[option] = options[option]
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	164
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	165 d = self._dbpool.runInteraction(self._setConfiguration, config)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	166 d.addCallback(self._setCachedConfiguration, config)
124 c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	167 return d
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	168
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	169
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	170 def _setConfiguration(self, cursor, config):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	171 self._checkNodeExists(cursor)
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	172 cursor.execute("""UPDATE nodes SET persistent=%s, deliver_payload=%s,
fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	173 send_last_published_item=%s
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	174 WHERE node=%s""",
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	175 (config["pubsub#persist_items"],
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	176 config["pubsub#deliver_payloads"],
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	177 config["pubsub#send_last_published_item"],
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	178 self.nodeIdentifier))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	179
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	180
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	181 def _setCachedConfiguration(self, void, config):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	182 self._config = config
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	183
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	184
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	185 def getMetaData(self):
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	186 config = copy.copy(self._config)
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	187 config["pubsub#node_type"] = self.nodeType
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	188 return config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	189
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	190
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	191 def getAffiliation(self, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	192 return self._dbpool.runInteraction(self._getAffiliation, entity)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	193
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	194
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	195 def _getAffiliation(self, cursor, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	196 self._checkNodeExists(cursor)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	197 cursor.execute("""SELECT affiliation FROM affiliations
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	198 JOIN nodes ON (node_id=nodes.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	199 JOIN entities ON (entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	200 WHERE node=%s AND jid=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	201 (self.nodeIdentifier,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	202 entity.userhost()))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	203
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	204 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	205 return cursor.fetchone()[0]
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	206 except TypeError:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	207 return None
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	208
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	209
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	210 def getSubscription(self, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	211 return self._dbpool.runInteraction(self._getSubscription, subscriber)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	212
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	213
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	214 def _getSubscription(self, cursor, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	215 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	216
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	217 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	218 resource = subscriber.resource or ''
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	219
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	220 cursor.execute("""SELECT subscription FROM subscriptions
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	221 JOIN nodes ON (nodes.id=subscriptions.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	222 JOIN entities ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	223 (entities.id=subscriptions.entity_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	224 WHERE node=%s AND jid=%s AND resource=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	225 (self.nodeIdentifier,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	226 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	227 resource))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	228 try:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	229 return cursor.fetchone()[0]
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	230 except TypeError:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	231 return None
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	232
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	233
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	234 def addSubscription(self, subscriber, state):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	235 return self._dbpool.runInteraction(self._addSubscription, subscriber,
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	236 state)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	237
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	238
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	239 def _addSubscription(self, cursor, subscriber, state):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	240 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	241
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	242 userhost = subscriber.userhost()
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	243 resource = subscriber.resource or ''
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	244
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	245 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	246 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	247 (userhost))
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	248 except cursor._pool.dbapi.OperationalError:
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	249 pass
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	250
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	251 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	252 cursor.execute("""INSERT INTO subscriptions
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	253 (node_id, entity_id, resource, subscription)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	254 SELECT n.id, e.id, %s, %s FROM
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	255 (SELECT id FROM nodes WHERE node=%s) AS n
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	256 CROSS JOIN
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	257 (SELECT id FROM entities WHERE jid=%s) AS e""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	258 (resource,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	259 state,
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	260 self.nodeIdentifier,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	261 userhost))
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	262 except cursor._pool.dbapi.OperationalError:
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	263 raise error.SubscriptionExists()
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	264
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	265
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	266 def removeSubscription(self, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	267 return self._dbpool.runInteraction(self._removeSubscription,
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	268 subscriber)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	269
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	270
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	271 def _removeSubscription(self, cursor, subscriber):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	272 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	273
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	274 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	275 resource = subscriber.resource or ''
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	276
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	277 cursor.execute("""DELETE FROM subscriptions WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	278 node_id=(SELECT id FROM nodes WHERE node=%s) AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	279 entity_id=(SELECT id FROM entities WHERE jid=%s)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	280 AND resource=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	281 (self.nodeIdentifier,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	282 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	283 resource))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	284 if cursor.rowcount != 1:
171 bc269696ef42 Reply with the correct error condition on subscription when not subscribed. Ralph Meijer <ralphm@ik.nu> parents: 170 diff changeset	285 raise error.NotSubscribed()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	286
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	287 return None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	288
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	289
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	290 def getSubscribers(self):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	291 d = self._dbpool.runInteraction(self._getSubscribers)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	292 d.addCallback(self._convertToJIDs)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	293 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	294
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	295
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	296 def _getSubscribers(self, cursor):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	297 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	298 cursor.execute("""SELECT jid, resource FROM subscriptions
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	299 JOIN nodes ON (node_id=nodes.id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	300 JOIN entities ON (entity_id=entities.id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	301 WHERE node=%s AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	302 subscription='subscribed'""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	303 (self.nodeIdentifier,))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	304 return cursor.fetchall()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	305
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	306
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	307 def _convertToJIDs(self, list):
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	308 return [jid.internJID("%s/%s" % (l[0], l[1])) for l in list]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	309
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	310
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	311 def isSubscribed(self, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	312 return self._dbpool.runInteraction(self._isSubscribed, entity)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	313
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	314
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	315 def _isSubscribed(self, cursor, entity):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	316 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	317
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	318 cursor.execute("""SELECT 1 FROM entities
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	319 JOIN subscriptions ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	320 (entities.id=subscriptions.entity_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	321 JOIN nodes ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	322 (nodes.id=subscriptions.node_id)
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	323 WHERE entities.jid=%s
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	324 AND node=%s AND subscription='subscribed'""",
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	325 (entity.userhost(),
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	326 self.nodeIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	327
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	328 return cursor.fetchone() is not None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	329
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	330
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	331 def getAffiliations(self):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	332 return self._dbpool.runInteraction(self._getAffiliations)
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	333
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	334
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	335 def _getAffiliations(self, cursor):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	336 self._checkNodeExists(cursor)
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	337
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	338 cursor.execute("""SELECT jid, affiliation FROM nodes
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	339 JOIN affiliations ON
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	340 (nodes.id = affiliations.node_id)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	341 JOIN entities ON
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	342 (affiliations.entity_id = entities.id)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	343 WHERE node=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	344 self.nodeIdentifier)
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	345 result = cursor.fetchall()
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	346
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	347 return [(jid.internJID(r[0]), r[1]) for r in result]
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	348
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	349
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	350
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	351 class LeafNodeMixin:
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	352
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	353 nodeType = 'leaf'
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	354
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	355 def storeItems(self, items, publisher):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	356 return self._dbpool.runInteraction(self._storeItems, items, publisher)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	357
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	358
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	359 def _storeItems(self, cursor, items, publisher):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	360 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	361 for item in items:
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	362 self._storeItem(cursor, item, publisher)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	363
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	364
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	365 def _storeItem(self, cursor, item, publisher):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	366 data = item.toXml()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	367 cursor.execute("""UPDATE items SET date=now(), publisher=%s, data=%s
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	368 FROM nodes
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	369 WHERE nodes.id = items.node_id AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	370 nodes.node = %s and items.item=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	371 (publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	372 data,
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	373 self.nodeIdentifier,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	374 item["id"]))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	375 if cursor.rowcount == 1:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	376 return
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	377
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	378 cursor.execute("""INSERT INTO items (node_id, item, publisher, data)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	379 SELECT id, %s, %s, %s FROM nodes WHERE node=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	380 (item["id"],
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	381 publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	382 data,
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	383 self.nodeIdentifier))
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	384
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	385
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	386 def removeItems(self, itemIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	387 return self._dbpool.runInteraction(self._removeItems, itemIdentifiers)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	388
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	389
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	390 def _removeItems(self, cursor, itemIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	391 self._checkNodeExists(cursor)
180 fc687620599b Properly add send_last_published_item configuration item. Ralph Meijer <ralphm@ik.nu> parents: 173 diff changeset	392
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	393 deleted = []
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	394
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	395 for itemIdentifier in itemIdentifiers:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	396 cursor.execute("""DELETE FROM items WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	397 node_id=(SELECT id FROM nodes WHERE node=%s) AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	398 item=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	399 (self.nodeIdentifier,
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	400 itemIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	401
142 812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	402 if cursor.rowcount:
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	403 deleted.append(itemIdentifier)
142 812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	404
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	405 return deleted
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	406
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	407
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	408 def getItems(self, maxItems=None):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	409 return self._dbpool.runInteraction(self._getItems, maxItems)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	410
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	411
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	412 def _getItems(self, cursor, maxItems):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	413 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	414 query = """SELECT data FROM nodes JOIN items ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	415 (nodes.id=items.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	416 WHERE node=%s ORDER BY date DESC"""
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	417 if maxItems:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	418 cursor.execute(query + " LIMIT %s",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	419 (self.nodeIdentifier,
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	420 maxItems))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	421 else:
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	422 cursor.execute(query, (self.nodeIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	423
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	424 result = cursor.fetchall()
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	425 return [parseXml(r[0]) for r in result]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	426
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	427
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	428 def getItemsById(self, itemIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	429 return self._dbpool.runInteraction(self._getItemsById, itemIdentifiers)
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	430
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	431
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	432 def _getItemsById(self, cursor, itemIdentifiers):
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	433 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	434 items = []
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	435 for itemIdentifier in itemIdentifiers:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	436 cursor.execute("""SELECT data FROM nodes JOIN items ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	437 (nodes.id=items.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	438 WHERE node=%s AND item=%s""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	439 (self.nodeIdentifier,
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	440 itemIdentifier))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	441 result = cursor.fetchone()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	442 if result:
202 77c61e2b8c75 Use `domish.Element`s to represent items, instead of serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 198 diff changeset	443 items.append(parseXml(result[0]))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	444 return items
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	445
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	446
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	447 def purge(self):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	448 return self._dbpool.runInteraction(self._purge)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	449
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	450
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	451 def _purge(self, cursor):
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	452 self._checkNodeExists(cursor)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	453
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	454 cursor.execute("""DELETE FROM items WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	455 node_id=(SELECT id FROM nodes WHERE node=%s)""",
198 e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	456 (self.nodeIdentifier,))
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	457
e404775b12df Change naming and spacing conventions to match Twisted's. Ralph Meijer <ralphm@ik.nu> parents: 181 diff changeset	458
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	459
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	460 class LeafNode(Node, LeafNodeMixin):
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	461
167 ef22e4150caa Move protocol implementations (pubsub, disco, forms) to and depend on wokkel. Ralph Meijer <ralphm@ik.nu> parents: 163 diff changeset	462 implements(iidavoll.ILeafNode)

Mercurial > libervia-pubsub

annotate idavoll/pgsql_storage.py @ 202:77c61e2b8c75