← Back to branch summary

~zhangew401/scope-aggregator/fix-empty-query-to-clickstore

« back to all changes in this revision

Viewing changes to src/query.cpp

  • Committer: Kyle Nitzsche
  • Date: 2016-02-09 16:11:02 UTC
  • mfrom: (155.2.7 cleanups)
  • Revision ID: kyle.nitzsche@canonical.com-20160209161102-d0dsykeo14hh353g
merge cleanup branch and set to DEV version 4.2.1 (next release version
will be 4.3)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/query.cpp
1194
1194
    // also set cardinality, default and per scope
1195
1195
    for (unsigned int i = 0; i < replies.size(); ++i) {
1196
1196
        us::SearchMetadata metadata(search_metadata());
1197
 
        auto scope = scopes_m[scopes_m_int_localId[i]];
 
1197
        std::string locID = scopes_m_int_localId[i];
 
1198
        qDebug() << "==== locID: " << QString::fromStdString(locID);
 
1199
        auto scope = scopes_m[locID];
1198
1200
 
1199
1201
        if (scope->keyword_scope())
1200
1202
        {
1227
1229
        qDebug() << "===- LOCAL_ID: " << qstr(scope->local_id());
1228
1230
        metadata.set_hint(scope->local_id(), us::Variant("valueMeansNothing"));
1229
1231
 
1230
 
        std::string query_text = query_string;
1231
 
 
1232
 
        // if scope is clickstore, set query string to open to scope
1233
 
        if ( scope->source_finder())
1234
 
        {
1235
 
            if (query_store_ != "")
1236
 
                query_text = query_store_;
1237
 
            else
1238
 
                query_text = query_string;
1239
 
        }
1240
 
 
1241
1232
        // dispatch subsearches differently depending on whether is keyword or declared scope
1242
 
        if (scopes_m_int_localId[i] == "com.canonical.scopes.clickstore")
 
1233
        if (locID == "com.canonical.scopes.clickstore")
1243
1234
        {
1244
1235
            for (auto ch : current_child_scopes)
1245
1236
            {
1246
 
                if (ch.id == localId_id_m[scopes_m_int_localId[i]])
 
1237
                if (ch.id == localId_id_m[locID])
1247
1238
                {
1248
 
                    qDebug() << "=== subsearch CLICKSTORE scope: " << qstr(scopes_m_int_localId[i]);
 
1239
                    qDebug() << "=== subsearch CLICKSTORE scope, locald_ID: " << qstr(locID) << " for: " << QString::fromStdString(query_store_);
1249
1240
                    subsearch
1250
1241
                    (
1251
1242
                        ch,
1264
1255
        {
1265
1256
            for (auto ch : current_child_scopes)
1266
1257
            {
1267
 
                if (ch.id == localId_id_m[scopes_m_int_localId[i]])
 
1258
                if (ch.id == localId_id_m[locID])
1268
1259
                {
1269
 
                    qDebug() << "=== subsearch KEYWORD keyword scope: " << qstr(scopes_m_int_localId[i]);
 
1260
                    qDebug() << "=== subsearch KEYWORD keyword scope: " << qstr(locID);
1270
1261
                    std::set<std::string> keywords;
1271
1262
                    keywords.insert(scope->keyword());
1272
1263
                    ch.keywords = keywords;
1291
1282
            for (auto ch : current_child_scopes)
1292
1283
            {
1293
1284
 
1294
 
                if (ch.id == localId_id_m[scopes_m_int_localId[i]])
 
1285
                if (ch.id == localId_id_m[locID])
1295
1286
                {
1296
1287
                    qDebug() << "=== subsearch non KEYWORD scope local_ id " << qstr(scope->local_id());
1297
1288
                    qDebug() << "=== subsearch non KEYWORD scope id " << qstr(scope->id());
1308
1299
                    std::string adj_qry;
1309
1300
                    if (!query_string.empty())
1310
1301
                        adj_qry = query_string;
1311
 
                    else if (!localId_defaultQryStr[scopes_m_int_localId[i]].empty())
1312
 
                        adj_qry = localId_defaultQryStr[scopes_m_int_localId[i]];
 
1302
                    else if (!localId_defaultQryStr[locID].empty())
 
1303
                        adj_qry = localId_defaultQryStr[locID];
1313
1304
                    else
1314
1305
                        adj_qry = "";
1315
1306