Merge lp:~jamesh/unity-lens-applications/scope-search-fixes into lp:~unity-team/unity-lens-applications/libunity7-compatible

[James Henstridge]

Various scope search result fixes: show local scopes on empty search, filter out master scopes from results and move disabled local scopes to available category.

Some followup fixes to my index-local-scopes branch:

 1. Display some local scope results for empty searches (it was performing an empty query in this case, which gave no results).

 2. Filter out master scopes from the results (bug #1174464)

 3. Place disabled local scopes in the "available" category rather than "installed".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-raring-amd64-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-applications-libunity7-compatible-ci/10/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

8 + // We get no results for an empty search, so use a search that
9 + // should match everything.
10 + if (!has_search) {
11 + search_string = "type:Scope";
12 + }

Could you move these conditions into the xapian-utils.vala source?

Otherwise looking good.

review: Needs Fixing

[lp:~jamesh/unity-lens-applications/scope-search-fixes]

346. By James Henstridge on 2013-04-30

When searching local scopes, pass the query string through the
XapianUtils helpers.

[James Henstridge (jamesh)]

Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:346
http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-lens-applications-libunity7-compatible-raring-amd64-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-lens-applications-libunity7-compatible-ci/12/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-04-24 12:04:17 +0000
+++ src/daemon.vala	2013-04-30 18:49:26 +0000
@@ -1053,8 +1053,10 @@
         return;
 
       bool has_search = !Utils.is_search_empty (search_string);
+      var pkg_search_string = XapianUtils.prepare_pkg_search_string (
+          search_string, null);
 
-      var results = scopesearcher.search (search_string, 0,
+      var results = scopesearcher.search (pkg_search_string, 0,
                                           Unity.Package.SearchType.PREFIX,
                                           has_search ?
                                             Unity.Package.Sort.BY_RELEVANCY :
@@ -1069,10 +1071,18 @@
           continue;
         installed_uris.add(dedup_key);
 
+        /* Don't include master scopes in the search results.  This is
+         * performed after deduping so the master scopes don't just
+         * move to hte "available" category. */
+        if (info.is_master_scope)
+          continue;
+
         var uri = @"scope://$(info.desktop_file)";
         var name = info.application_name;
         var icon_hint = info.icon;
         var comment = info.description;
+        var category = info.desktop_file in disabled_scope_ids ?
+          Category.AVAILABLE : Category.INSTALLED;
 
         try
         {
@@ -1089,7 +1099,7 @@
 
         model.append (uri,
                       icon_hint,
-                      Category.INSTALLED,
+                      category,
                       ResultType.DEFAULT,
                       "application/x-unity-scope",
                       name != "" ? name : uri,

=== modified file 'src/unity-package-search.cc'
--- src/unity-package-search.cc	2013-04-24 10:16:55 +0000
+++ src/unity-package-search.cc	2013-04-30 18:49:26 +0000
@@ -59,6 +59,10 @@
 #define XAPIAN_VALUE_EXENAME 294
 #define XAPIAN_VALUE_CURRENCY 201
 
+/* this isn't a Software Center slot, but we use it to mark master
+ * scopes in the scope index. */
+#define XAPIAN_VALUE_MASTERSCOPE 1000
+
 #include "unity-package-search.h"
 #include "columbus.hh"
 
@@ -403,6 +407,8 @@
     doc.add_value (XAPIAN_VALUE_ICON, info->icon);
   if (info->id != NULL)
     doc.add_value (XAPIAN_VALUE_DESKTOP_FILE, info->id);
+  if (info->is_master)
+      doc.add_value (XAPIAN_VALUE_MASTERSCOPE, "true");
 
   indexer->set_document (doc);
   if (info->name != NULL)
@@ -564,6 +570,9 @@
   const string purchase_date = doc.get_value (XAPIAN_VALUE_PURCHASED_DATE);
   pkginfo->needs_purchase = purchase_date.empty ();
 
+  string is_master = doc.get_value (XAPIAN_VALUE_MASTERSCOPE);
+  pkginfo->is_master_scope = (is_master == "true");
+
   return pkginfo;
 }
 

=== modified file 'src/unity-package-search.h'
--- src/unity-package-search.h	2013-04-24 09:59:36 +0000
+++ src/unity-package-search.h	2013-04-30 18:49:26 +0000
@@ -51,6 +51,7 @@
         gchar    *price;
         gboolean  needs_purchase;
         gint      relevancy;
+        gboolean  is_master_scope;
 } UnityPackageInfo;
 
 typedef gboolean (*AppFilterCallback)(UnityPackageInfo *, void *);

=== modified file 'vapi/unity-package-search.vapi'
--- vapi/unity-package-search.vapi	2013-04-24 09:59:36 +0000
+++ vapi/unity-package-search.vapi	2013-04-30 18:49:26 +0000
@@ -57,6 +57,7 @@
       public string price;
       public bool needs_purchase;
       public int relevancy;
+      public bool is_master_scope;
     }
   }
 }