Merge lp:~zhangew401/scope-aggregator/fix-empty-query-to-clickstore into lp:scope-aggregator

[Zhang Enwei]

In r170, when query_store_ is empty, some random scopes will be recommended, we need to fix this.
Also fix comments from Gary.

[Kyle Nitzsche (knitzsche)]

Looks good to me.

Cheers

review: Approve

=== modified file 'src/query.cpp'
--- src/query.cpp	2016-07-12 17:14:05 +0000
+++ src/query.cpp	2016-08-04 05:05:15 +0000
@@ -1330,23 +1330,26 @@
         qDebug() << "==== QUERY STRING: " << QString::fromStdString(query_string);
         if (locID == "com.canonical.scopes.clickstore")
         {
-            for (auto ch : current_child_scopes)
+            if (query_store_ != "")
             {
-                if (ch.id == localId_id_m[locID])
+                for (auto ch : current_child_scopes)
                 {
-                    qDebug() << "=== subsearch CLICKSTORE scope, locald_ID: " << qstr(locID) << " for: " << QString::fromStdString(query_store_);
-                    subsearch
-                    (
-                        ch,
-                        query_store_,
-                        "",
-                        us::FilterState(),
-                        metadata,
-                        replies[i]
-                    );
-                    break;
+                    if (ch.id == localId_id_m[locID])
+                    {
+                        qDebug() << "=== subsearch CLICKSTORE scope, locald_ID: " << qstr(locID) << " for: " << QString::fromStdString(query_store_);
+                        subsearch
+                        (
+                            ch,
+                            query_store_,
+                            "",
+                            us::FilterState(),
+                            metadata,
+                            replies[i]
+                        );
+                        break;
+                    }
+
                 }
-
             }
         }
         else if (scope->keyword_scope())

=== modified file 'src/utils.cpp'
--- src/utils.cpp	2016-08-04 01:11:41 +0000
+++ src/utils.cpp	2016-08-04 05:05:15 +0000
@@ -1149,17 +1149,9 @@
             scope->set_proxy(registry_);
 
             if (!scope->exists()) {
-                auto myID = QString::fromStdString(id);
-                myID = myID.left(myID.indexOf("_"));
-                if (query_store_ == "")
-                {
-                    query_store_.append("name:");
-                }
-                else
-                {
-                    query_store_.append("+");
-                }
-                query_store_.append(myID.toStdString());
+                std::string sep = query_store_  == "" ? "name:" : "+";
+                std::string name = std::string(id, 0, id.find('_'));
+                query_store_.append(sep + name);
             }
             else
             {
@@ -1172,17 +1164,9 @@
             AggChildScope scope(source);
             scope.set_proxy(registry_);
             if (!scope.exists()) {
-                auto myID = QString::fromStdString(source);
-                myID = myID.left(myID.indexOf("_"));
-                if (query_store_ == "")
-                {
-                    query_store_.append("name:");
-                }
-                else
-                {
-                    query_store_.append("+");
-                }
-                query_store_.append(myID.toStdString());
+                std::string sep = query_store_  == "" ? "name:" : "+";
+                std::string name = std::string(source, 0, source.find('_'));
+                query_store_.append(sep + name);
             }
         }
     }