1.1 --- a/imiptools/stores/common.py Mon Oct 16 20:45:25 2017 +0200
1.2 +++ b/imiptools/stores/common.py Mon Oct 16 22:10:22 2017 +0200
1.3 @@ -97,12 +97,6 @@
1.4
1.5 pass
1.6
1.7 - def get_complete_event(self, user, uid):
1.8 -
1.9 - "Get the event for the given 'user' with the given 'uid'."
1.10 -
1.11 - pass
1.12 -
1.13 def set_event(self, user, uid, recurrenceid, node):
1.14
1.15 """
1.16 @@ -114,9 +108,9 @@
1.17 if recurrenceid:
1.18 return self.set_recurrence(user, uid, recurrenceid, node)
1.19 else:
1.20 - return self.set_complete_event(user, uid, node)
1.21 + return self.set_parent_event(user, uid, node)
1.22
1.23 - def set_complete_event(self, user, uid, node):
1.24 + def set_parent_event(self, user, uid, node):
1.25
1.26 "Set an event for 'user' having the given 'uid' and 'node'."
1.27
2.1 --- a/imiptools/stores/database/common.py Mon Oct 16 20:45:25 2017 +0200
2.2 +++ b/imiptools/stores/database/common.py Mon Oct 16 22:10:22 2017 +0200
2.3 @@ -174,22 +174,7 @@
2.4 result = self.cursor.fetchone()
2.5 return result and Object(parse_string(result[0], "utf-8"))
2.6
2.7 - def get_complete_event(self, user, uid):
2.8 -
2.9 - "Get the event for the given 'user' with the given 'uid'."
2.10 -
2.11 - columns = ["store_user", "object_uid"]
2.12 - values = [user, uid]
2.13 -
2.14 - query, values = self.get_query(self.with_tables(
2.15 - "select object_text from %(objects)s :condition"),
2.16 - columns, values)
2.17 -
2.18 - self.cursor.execute(query, values)
2.19 - result = self.cursor.fetchone()
2.20 - return result and Object(parse_string(result[0], "utf-8"))
2.21 -
2.22 - def set_complete_event(self, user, uid, node):
2.23 + def set_parent_event(self, user, uid, node):
2.24
2.25 "Set an event for 'user' having the given 'uid' and 'node'."
2.26
2.27 @@ -204,7 +189,7 @@
2.28
2.29 self.cursor.execute(query, values)
2.30
2.31 - if self.cursor.rowcount > 0 or self.get_complete_event(user, uid):
2.32 + if self.cursor.rowcount > 0 or self.get_event(user, uid):
2.33 return True
2.34
2.35 columns = ["store_user", "object_uid", "object_text", "status"]
2.36 @@ -354,7 +339,7 @@
2.37 if recurrenceid:
2.38 return self.get_recurrence_table(dirname)
2.39 else:
2.40 - return self.get_complete_event_table(dirname)
2.41 + return self.get_parent_event_table(dirname)
2.42
2.43 def get_event_table_filters(self, dirname=None):
2.44
2.45 @@ -365,7 +350,7 @@
2.46 else:
2.47 return ["status"], ["active"]
2.48
2.49 - def get_complete_event_table(self, dirname=None):
2.50 + def get_parent_event_table(self, dirname=None):
2.51
2.52 "Get the table providing events for any specified 'dirname'."
2.53
3.1 --- a/imiptools/stores/file.py Mon Oct 16 20:45:25 2017 +0200
3.2 +++ b/imiptools/stores/file.py Mon Oct 16 22:10:22 2017 +0200
3.3 @@ -169,17 +169,7 @@
3.4
3.5 return filename and self._get_object(user, filename)
3.6
3.7 - def get_complete_event(self, user, uid):
3.8 -
3.9 - "Get the event for the given 'user' with the given 'uid'."
3.10 -
3.11 - filename = self.get_complete_event_filename(user, uid)
3.12 - if not filename or not isfile(filename):
3.13 - return None
3.14 -
3.15 - return filename and self._get_object(user, filename)
3.16 -
3.17 - def set_complete_event(self, user, uid, node):
3.18 + def set_parent_event(self, user, uid, node):
3.19
3.20 "Set an event for 'user' having the given 'uid' and 'node'."
3.21
3.22 @@ -299,7 +289,7 @@
3.23 if recurrenceid:
3.24 return self.get_recurrence_filename(user, uid, recurrenceid, dirname, username)
3.25 else:
3.26 - return self.get_complete_event_filename(user, uid, dirname, username)
3.27 + return self.get_parent_event_filename(user, uid, dirname, username)
3.28
3.29 def get_recurrence_filename(self, user, uid, recurrenceid, dirname=None, username=None):
3.30
3.31 @@ -316,7 +306,7 @@
3.32
3.33 return self.get_object_in_store(user, dirname, "recurrences", uid, recurrenceid, username)
3.34
3.35 - def get_complete_event_filename(self, user, uid, dirname=None, username=None):
3.36 + def get_parent_event_filename(self, user, uid, dirname=None, username=None):
3.37
3.38 """
3.39 Get the filename providing the event for the given 'user' with the given