Merge lp:~zeitgeist/zeitgeist/fix-909708 into lp:~zeitgeist/zeitgeist/bluebird

[Seif Lotfy]

This branch fixes the issue where inserting and event with 2 subjects.
Since we already parse the subjects before insertion I added a list with subj_uris to find if there is a duplicate and return 0 if one is found

[Siegfried Gevatter (rainct)]

 - Why do you use a List? Make that a SList. Even better, we know how many subjects there are so we can just use a fixed size array or something.

 - Fix the formatting: "null) {", ".append(s".

 - A comment before the "return 0" explaining what happened would be nice ("// Events with two subjects with the same URI are not supported."). Also, return a warning so people will notice they're doing it wrong.

review: Needs Fixing

[lp:~zeitgeist/zeitgeist/fix-909708]

363. By Seif Lotfy on 2012-01-02

fixed style and replaced list with slist as well as print out a warning upon detection of 2 identical uris in same event2

[Siegfried Gevatter (rainct)]

review: Approve

=== modified file 'src/engine.vala'
--- src/engine.vala	2011-12-31 18:17:04 +0000
+++ src/engine.vala	2012-01-02 18:41:26 +0000
@@ -584,13 +584,23 @@
             var uris = new GenericArray<string> ();
             var texts = new GenericArray<string> ();
             var storages = new GenericArray<string> ();
+            var subj_uris = new SList<string> ();
 
             if (event.origin != "")
                 uris.add (event.origin);
 
+            // Iterate through subjects and check for validity
             for (int i = 0; i < event.num_subjects(); ++i)
             {
                 unowned Subject subject = event.subjects[i];
+                if (subj_uris.find_custom(subject.uri, strcmp) != null)
+                {
+                    // Events with two subjects with the same URI are not supported.
+                    warning ("Events with two subjects with the same URI are not supported");
+                    return 0;
+                }
+                subj_uris.append (subject.uri);
+
                 uris.add (subject.uri);
 
                 if (subject.current_uri == "" || subject.current_uri == null)
 
=== modified file 'test/dbus/remote-test.py'
--- test/dbus/remote-test.py	2011-12-29 13:59:16 +0000
+++ test/dbus/remote-test.py	2012-01-02 18:41:26 +0000
@@ -252,6 +252,7 @@
 		events[0].subjects.append(list(events[0].subjects[0]))
 		ids = self.insertEventsAndWait(events)
 		self.assertEquals(3, len(set(ids)))
+		self.assertEquals(0, ids[0])
 
 class ZeitgeistRemoteFindEventIdsTest(testutils.RemoteTestCase):
 	"""