From 31966892ffa7a42720c3e2c4d9033657f0e3ecf4 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Tue, 9 Jan 2007 19:16:18 +0000 Subject: [PATCH] - use Row.add_object and Row.remove_object --- PLC/Sessions.py | 46 +++++----------------------------------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/PLC/Sessions.py b/PLC/Sessions.py index 305e55bd..8c9701b4 100644 --- a/PLC/Sessions.py +++ b/PLC/Sessions.py @@ -30,51 +30,15 @@ class Session(Row): return time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(expires)) - def add_person(self, person, commit = True): - """ - Associate person with session. - """ - - assert 'session_id' in self - assert isinstance(person, Person) - assert 'person_id' in person - - session_id = self['session_id'] - person_id = person['person_id'] - - self.api.db.do("INSERT INTO person_session (session_id, person_id)" \ - " VALUES(%(session_id)s, %(person_id)d)", - locals()) - - if commit: - self.api.db.commit() - - self['person_id'] = person_id + add_person = Row.add_object(Person, 'person_session') def add_node(self, node, commit = True): - """ - Associate node with session. - """ - - assert 'session_id' in self - assert isinstance(node, Node) - assert 'node_id' in node - - session_id = self['session_id'] - node_id = node['node_id'] - # Nodes can have only one session at a time - self.api.db.do("DELETE FROM node_session WHERE node_id = %(node_id)d", - locals()) - - self.api.db.do("INSERT INTO node_session (session_id, node_id)" \ - " VALUES(%(session_id)s, %(node_id)d)", - locals()) - - if commit: - self.api.db.commit() + self.api.db.do("DELETE FROM node_session WHERE node_id = %d" % \ + node['node_id']) - self['node_id'] = node_id + add = Row.add_object(Node, 'person_session') + add(self, node, commit) def sync(self, commit = True, insert = None): if not self.has_key('session_id'): -- 2.47.0