Merge lp:~mhr3/unity-lens-applications/strip-query into lp:~unity-team/unity-lens-applications/libunity7-compatible

[Michal Hruby]

String query string before using it to construct DB queries.

String query string before using it to construct DB queries.

This fixes the issue where searching for " " and then changing the filterset will produce empty resultset.

[Paweł Stołowski (stolowski)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-03-22 10:36:48 +0000
+++ src/daemon.vala	2013-04-12 16:39:24 +0000
@@ -501,14 +501,15 @@
       /* We'll clear the model once we finish waiting for the dbus-call
        * to finish, to prevent flicker. */
 
-      debug ("Searching for: %s", search.search_string);
+      var search_string = search.search_string.strip ();
+      debug ("Searching for: %s", search_string);
 
       var type_filter = search.get_filter ("type") as OptionsFilter;
 
-      string pkg_search_string = XapianUtils.prepare_pkg_search_string (search.search_string, type_filter);
+      string pkg_search_string = XapianUtils.prepare_pkg_search_string (search_string, type_filter);
 
       bool has_filter = (type_filter != null && type_filter.filtering);
-      bool has_search = !Utils.is_search_empty (search.search_string);
+      bool has_search = !Utils.is_search_empty (search_string);
 
       Timer timer = new Timer ();
 
@@ -568,7 +569,7 @@
           // no need to bother
           return;
         } catch (GLib.Error e) {
-          warning ("Error performing search '%s': %s", search.search_string, e.message);
+          warning ("Error performing search '%s': %s", search_string, e.message);
         }
       }
 
@@ -594,7 +595,7 @@
         else if (has_filter) /* Empty search string + active filters should get lots of results from selected categories */
         {
           timer.start ();
-          string? filter_query = XapianUtils.prepare_pkg_search_string (search.search_string, type_filter);
+          string? filter_query = XapianUtils.prepare_pkg_search_string (search_string, type_filter);
 
           var pkgresults = pkgsearcher.get_apps (filter_query, MAX_APP_FOR_DOWNLOAD_FOR_EMPTY_QUERY, filter_cb);
           purchase_info.from_pkgresults (pkgresults);
@@ -641,7 +642,7 @@
       // add scopes (if filter is active)
       if (!has_filter || type_filter.get_option ("scopes").active)
       {
-        add_remote_scopes_results (search.search_string, model);
+        add_remote_scopes_results (search_string, model);
       }
 
       if (model.get_n_rows () == 0)
@@ -658,8 +659,9 @@
        * In global search, with a non-empty search string, we collate all
        * hits under one Applications category
        */
+      var search_string = search.search_string.strip ();
 
-      if (Utils.is_search_empty (search.search_string))
+      if (Utils.is_search_empty (search_string))
       {
         yield update_global_without_search (search, cancellable);
         return;
@@ -669,11 +671,11 @@
 
       model.clear ();
 
-      var search_string = XapianUtils.prepare_pkg_search_string (search.search_string, null);
+      var pkg_search_string = XapianUtils.prepare_pkg_search_string (search_string, null);
       Set<string> installed_uris = new HashSet<string> ();
       Set<string> available_uris = new HashSet<string> ();
       var timer = new Timer ();
-      var appresults = appsearcher.search (search_string, 0,
+      var appresults = appsearcher.search (pkg_search_string, 0,
                                            Unity.Package.SearchType.PREFIX,
                                            Unity.Package.Sort.BY_RELEVANCY);
       resort_pkg_search_results (appresults);
@@ -682,7 +684,7 @@
 
       timer.stop ();
       debug ("Global search listed %i Installed apps in %fms for query: %s",
-             appresults.num_hits, timer.elapsed ()*1000, search_string);
+             appresults.num_hits, timer.elapsed ()*1000, pkg_search_string);
     }
 
     private async void update_global_without_search (DeprecatedScopeSearch search,
@@ -700,8 +702,8 @@
       {
         try
         {
-          var zg_search_string = XapianUtils.prepare_zg_search_string (search.search_string,
-                                                           null);
+          var zg_search_string = XapianUtils.prepare_zg_search_string ("",
+                                                                       null);
 
           var time_range = new Zeitgeist.TimeRange.anytime ();
           var results = yield log.find_events (time_range,