Merge lp:~knitzsche/scope-aggregator/bug-1508259-start-from-hintview into lp:scope-aggregator

[Kyle Nitzsche]

When a user taps Skip when Hints is displaying, the query string needs to be reset to "" in order to prevent subsearch child scopes with the incoming "start" query string, which this commit does.

[Gary.Wang (gary-wzl77)]

The small *remaining* issue for this bug is hiding query string in search box. Besides this cause, in some other cases, when we do some rich features, which requires continuous page transition from cardview from surface or back and forth by text querying, we really don't wanna show query_string in search box since that makes user confused. For developer, there would be one way to hide querying string and it's shown up always if text querying is made by end-user manually.
But currently there' s no way to deal with this. If unity api team can provide such capability, that would be wonderful.

review: Approve

[Kyle Nitzsche (knitzsche)]

@Gary, right, there is no way I know of (nor that the unity-api seems to know of) to hide the "start" string used as the signal.

The reason is that the hints scope invokes the agg scope with a uri that looks like this:
scope://com.canonical.scopes.dashboard_dashboard?q=start

That q=start query parameter is passed to the scope as a query string. The agg scope checks for "start" and if it is found, it writes a file to cache that causes hints not to show later.

This approach overloads the query param for two purposes and it is not presently feasible to disambiguate the two use cases.

We need a different approach for hints, which I will take care of this separately from this bug & MR.

Cheers

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-09 16:11:02 +0000
+++ CMakeLists.txt	2016-02-11 21:41:32 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.2.1")
+set(VERSION "4.2.2")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )

=== modified file 'src/query.cpp'
--- src/query.cpp	2015-12-02 22:19:12 +0000
+++ src/query.cpp	2016-02-11 21:41:32 +0000
@@ -108,7 +108,12 @@
     qDebug() << "==== HINTS. query_string" << qstr(query_string);
 
     if (uses_hints && hints_quickstart && hints_exists() && query_string == HINTS_HIDE)
+    {
         dismiss_hints_quickstart();
+	// when dismissing hints, query string must be set to "" to prevent subsearching 
+	// child scopes.
+        query_string = "";
+    }
 
     if (uses_hints && hints_quickstart && hints_exists() && !is_hints_quickstart_dismissed())
     {
@@ -1230,6 +1235,7 @@
         metadata.set_hint(scope->local_id(), us::Variant("valueMeansNothing"));
 
         // dispatch subsearches differently depending on whether is keyword or declared scope
+        qDebug() << "==== QUERY STRING: " << QString::fromStdString(query_string);
         if (locID == "com.canonical.scopes.clickstore")
         {
             for (auto ch : current_child_scopes)
@@ -1304,6 +1310,8 @@
                     else
                         adj_qry = "";
 
+			qDebug()<< "=== BUG. adj_qry: " << QString::fromStdString(adj_qry);
+
                     subsearch
                     (
                         ch,