Merge lp:~mhr3/unity-lens-applications/fix-985495 into lp:unity-lens-applications

[Michal Hruby]

Fix the way applications are clustered for popularity sorting

The popularity sorting is not working correctly in all cases, see info in attached bug.

Change the way we cluster apps. (plus lower the number of dbus roundtrips when doing empty global searches)

No tests for the sorting as this is dependent on the way user interacts with his system. (and the extra fix to reduce the roundtrips is already covered by an existing test)

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2012-03-27 10:07:53 +0000
+++ src/daemon.vala	2012-04-19 09:29:28 +0000
@@ -613,10 +613,10 @@
           var zg_search_string = prepare_zg_search_string (search.search_string,
                                                            null);
 
-          var results = yield zg_index.search (zg_search_string,
-                                               new Zeitgeist.TimeRange.anytime(),
+          var time_range = new Zeitgeist.TimeRange.anytime ();
+          var results = yield log.find_events (time_range,
                                                zg_templates,
-                                               0,
+                                               Zeitgeist.StorageState.ANY,
                                                40,
                                                Zeitgeist.ResultType.MOST_RECENT_SUBJECTS,
                                                cancellable);
@@ -809,9 +809,10 @@
          * will have slightly higher relevancy for item with name "Search
          * _f_or _f_iles" than "_F_irefox", and that's not what we want)
          */
-        int rel_a = a.relevancy / 10;
-        int rel_b = b.relevancy / 10;
-        if (rel_a == rel_b)
+        int rel_a = a.relevancy;
+        int rel_b = b.relevancy;
+        int delta = (rel_a - rel_b).abs ();
+        if (delta < 10)
         {
           string id_a = extract_desktop_id (a.desktop_file);
           string id_b = extract_desktop_id (b.desktop_file);