# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1508184622 -7200
# Node ID 867279f45f02ba7c3a6317b8dfa2777c4edc677e
# Parent  050f220a1c7a2667917beffb788e04bfb42544d2# Parent  f276b162de500e428b2ad6863e9a50436a4b0a77
Merged changes from the default branch.

diff -r 050f220a1c7a -r 867279f45f02 imiptools/stores/common.py
--- a/imiptools/stores/common.py	Mon Oct 16 20:45:25 2017 +0200
+++ b/imiptools/stores/common.py	Mon Oct 16 22:10:22 2017 +0200
@@ -97,12 +97,6 @@
 
         pass
 
-    def get_complete_event(self, user, uid):
-
-        "Get the event for the given 'user' with the given 'uid'."
-
-        pass
-
     def set_event(self, user, uid, recurrenceid, node):
 
         """
@@ -114,9 +108,9 @@
         if recurrenceid:
             return self.set_recurrence(user, uid, recurrenceid, node)
         else:
-            return self.set_complete_event(user, uid, node)
+            return self.set_parent_event(user, uid, node)
 
-    def set_complete_event(self, user, uid, node):
+    def set_parent_event(self, user, uid, node):
 
         "Set an event for 'user' having the given 'uid' and 'node'."
 
diff -r 050f220a1c7a -r 867279f45f02 imiptools/stores/database/common.py
--- a/imiptools/stores/database/common.py	Mon Oct 16 20:45:25 2017 +0200
+++ b/imiptools/stores/database/common.py	Mon Oct 16 22:10:22 2017 +0200
@@ -174,22 +174,7 @@
         result = self.cursor.fetchone()
         return result and Object(parse_string(result[0], "utf-8"))
 
-    def get_complete_event(self, user, uid):
-
-        "Get the event for the given 'user' with the given 'uid'."
-
-        columns = ["store_user", "object_uid"]
-        values = [user, uid]
-
-        query, values = self.get_query(self.with_tables(
-            "select object_text from %(objects)s :condition"),
-            columns, values)
-
-        self.cursor.execute(query, values)
-        result = self.cursor.fetchone()
-        return result and Object(parse_string(result[0], "utf-8"))
-
-    def set_complete_event(self, user, uid, node):
+    def set_parent_event(self, user, uid, node):
 
         "Set an event for 'user' having the given 'uid' and 'node'."
 
@@ -204,7 +189,7 @@
 
         self.cursor.execute(query, values)
 
-        if self.cursor.rowcount > 0 or self.get_complete_event(user, uid):
+        if self.cursor.rowcount > 0 or self.get_event(user, uid):
             return True
 
         columns = ["store_user", "object_uid", "object_text", "status"]
@@ -354,7 +339,7 @@
         if recurrenceid:
             return self.get_recurrence_table(dirname)
         else:
-            return self.get_complete_event_table(dirname)
+            return self.get_parent_event_table(dirname)
 
     def get_event_table_filters(self, dirname=None):
 
@@ -365,7 +350,7 @@
         else:
             return ["status"], ["active"]
 
-    def get_complete_event_table(self, dirname=None):
+    def get_parent_event_table(self, dirname=None):
 
         "Get the table providing events for any specified 'dirname'."
 
diff -r 050f220a1c7a -r 867279f45f02 imiptools/stores/file.py
--- a/imiptools/stores/file.py	Mon Oct 16 20:45:25 2017 +0200
+++ b/imiptools/stores/file.py	Mon Oct 16 22:10:22 2017 +0200
@@ -169,17 +169,7 @@
 
         return filename and self._get_object(user, filename)
 
-    def get_complete_event(self, user, uid):
-
-        "Get the event for the given 'user' with the given 'uid'."
-
-        filename = self.get_complete_event_filename(user, uid)
-        if not filename or not isfile(filename):
-            return None
-
-        return filename and self._get_object(user, filename)
-
-    def set_complete_event(self, user, uid, node):
+    def set_parent_event(self, user, uid, node):
 
         "Set an event for 'user' having the given 'uid' and 'node'."
 
@@ -299,7 +289,7 @@
         if recurrenceid:
             return self.get_recurrence_filename(user, uid, recurrenceid, dirname, username)
         else:
-            return self.get_complete_event_filename(user, uid, dirname, username)
+            return self.get_parent_event_filename(user, uid, dirname, username)
 
     def get_recurrence_filename(self, user, uid, recurrenceid, dirname=None, username=None):
 
@@ -316,7 +306,7 @@
 
         return self.get_object_in_store(user, dirname, "recurrences", uid, recurrenceid, username)
 
-    def get_complete_event_filename(self, user, uid, dirname=None, username=None):
+    def get_parent_event_filename(self, user, uid, dirname=None, username=None):
 
         """
         Get the filename providing the event for the given 'user' with the given