Merge lp:~chipaca/unity-lens-video/remote-recommendations-are-remote into lp:unity-lens-video/remote-videos-scope-trunk

[John Lenton]

This lets empty searches through, so we get recommendations.

This lets empty searches through, so we get recommendations.

A different branch would be to cache this. A quirk of that would be that we need/want to have it per source. Some smartness needed.

=== modified file 'debian/rules' (properties changed: -x to +x)
=== modified file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	2012-02-23 11:01:39 +0000
+++ src/unity-scope-video-remote	2012-02-23 13:58:19 +0000
@@ -112,9 +112,8 @@
             sources = ','.join(sources)
         # Ensure that we are not in Global search
         if search_type is Unity.SearchType.DEFAULT:
-            if len(search_string) > 0:
-                self.update_results_model(search_string, model, sources)
-                model.flush_revision_queue()
+            self.update_results_model(search_string, model, sources)
+            model.flush_revision_queue()
         if search:
             search.finished()
 
@@ -140,7 +139,7 @@
         """Query the server with the search string and the list of sources."""
         query = dict(q=search)
         if sources:
-            query['sources'] = sources
+            query['sources'] = sources.encode("utf-8")
         query = urllib.urlencode(query)
         url = "%s/search?%s" % (SERVER, query)
         print "Querying the server:", url