------------------------------------------------------------ revno: 312 committer: Seif Lotfy <s...@lotfy.com> branch nick: bluebird timestamp: Thu 2011-10-13 18:12:48 +0200 message: reverted changes from r237 modified: src/engine.vala test/dbus/engine-test.py
-- lp:~zeitgeist/zeitgeist/bluebird https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird Your team Zeitgeist Framework Team is subscribed to branch lp:~zeitgeist/zeitgeist/bluebird. To unsubscribe from this branch go to https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file 'src/engine.vala' --- src/engine.vala 2011-10-13 05:37:19 +0000 +++ src/engine.vala 2011-10-13 16:12:48 +0000 @@ -162,15 +162,6 @@ uint storage_state, uint max_events, uint result_type, BusName? sender=null) throws EngineError { - return find_event_ids_logic(time_range, event_templates, storage_state, - max_events, result_type); - } - - private uint32[] find_event_ids_logic (TimeRange time_range, - GenericArray<Event> event_templates, - uint storage_state, uint max_events, uint result_type, - bool distinct = true, BusName? sender=null) throws EngineError - { WhereClause where = new WhereClause (WhereClause.Type.AND); @@ -207,13 +198,7 @@ //if (!where.may_have_results ()) // return new uint32[0]; - string sql; - // FIXME: this doesn't make sense (and doesn't help for - // FindEventIds). find another fix - if (distinct) - sql = "SELECT DISTINCT id FROM event_view "; - else - sql = "SELECT id FROM event_view "; + string sql = "SELECT DISTINCT id FROM event_view "; string where_sql = ""; if (!where.is_empty ()) { @@ -364,8 +349,8 @@ uint storage_state, uint max_events, uint result_type, BusName? sender=null) throws EngineError { - return get_events (find_event_ids_logic (time_range, event_templates, - storage_state, max_events, result_type, false)); + return get_events (find_event_ids (time_range, event_templates, + storage_state, max_events, result_type)); } private struct RelatedUri { === modified file 'test/dbus/engine-test.py' --- test/dbus/engine-test.py 2011-09-18 12:10:22 +0000 +++ test/dbus/engine-test.py 2011-10-13 16:12:48 +0000 @@ -492,7 +492,7 @@ # Note: engine.insert_events() sets the id of the Event objects ev[0][0] = _ev.id - self.assertEquals(ev, _ev) + self.assertEquals(ev.payload, _ev.payload) def testQueryByParent (self): ev = Event.new_for_values(subject_interpretation=Interpretation.AUDIO)
_______________________________________________ Mailing list: https://launchpad.net/~zeitgeist Post to : zeitgeist@lists.launchpad.net Unsubscribe : https://launchpad.net/~zeitgeist More help : https://help.launchpad.net/ListHelp