Merge lp:~knitzsche/scope-aggregator/ota8-nearby-places-bug-1518346 into lp:scope-aggregator

[Kyle Nitzsche]

  For the first time, we have an aggregator using multiple keywords and a
  child scope wanting to be aggregated by more than one. This was not working
  due to some lacking clarity in the relationship of scope id to local id and
  the various structures used to track these. Should work now.

  For some background, see bug 1518346

[Kyle Nitzsche (knitzsche)]

Note that the broken use case was "keyword"s (not "categories" (even when containing keywords), and not "scopes").

[Gary.Wang (gary-wzl77)]

Looks good to me.
Thanks.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-23 15:14:43 +0000
+++ CMakeLists.txt	2015-11-20 22:28:57 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.0")
+set(VERSION "4.0.1")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2015-10-23 10:54:53 +0000
+++ src/query.cpp	2015-11-20 22:28:57 +0000
@@ -288,6 +288,8 @@
     int idx = -1;//used in scopes_m_int_localId to store scope local_id
     for (const std::string &local_id : scopes_ordered)
     {
+	qDebug() << "==== handle. checking scope locali_id: " << qstr(local_id);
+	qDebug() << "==== handle. checking scope id: " << qstr(localId_id_m[local_id]);
         // get a pointer to the current child scope (by id from the map)
         std::shared_ptr<AggChildScope> scope = scopes_m[local_id];
 
 
=== modified file 'src/utils.cpp'
--- src/utils.cpp	2015-09-14 02:37:51 +0000
+++ src/utils.cpp	2015-11-20 22:28:57 +0000
@@ -352,7 +352,7 @@
             declared_order.emplace_back(cat->id);
             categories.emplace_back(cat);
             id_category_m[cat->id] = cat;
-        }
+        } // end "category"
 
         if (item_o.contains("scope"))
         {
@@ -553,7 +553,7 @@
             child_scopes.emplace_back(cs);
             child_scopes_m[cs->local_id] = cs;
             type_ids_m[cs->local_id].emplace_back(cs->local_id);
-        }
+        } // end "scope"
         else if (item_o.contains("keyword"))
         {
             keyword keyword_;
@@ -678,7 +678,7 @@
 {
     for (std::string id : declared_order)
     {
-    qDebug() << "==== SET ORDER. DECLARED order id: " << qstr(id);
+    //qDebug() << "==== SET ORDER. DECLARED order id: " << qstr(id);
         for (auto pr : type_ids_m)
         {
             if (pr.first == id)
@@ -691,6 +691,9 @@
             }
         }
     }
+    for(auto sc : scopes_ordered) {
+	qDebug() << "==== FINAL ORDER: " << qstr(sc);
+    }
 }
 
 /*
@@ -821,14 +824,9 @@
         if (!keyword_child.enabled)
             continue;
 
-        std::vector<std::string>::iterator iter;
-        iter = find(current_scopes.begin(), current_scopes.end(), localId_id_m[keyword_child.id]);
-        if (iter != current_scopes.end()) // don't add as keyword if already added as declared
-            continue;
 
         AggChildScope keych(keyword_child.id);
         QString time_str = QDateTime::currentDateTimeUtc().toString();
-        keych.set_local_id(keyword_child.id + time_str.toStdString());
         keych.set_keyword_scope(true);
         dept d;
         d.id = keyword_child.id;
@@ -849,7 +847,13 @@
             });
             if (found_scopes.size() == 0 )
                 continue;
-            type_ids_m[kw].emplace_back(id);
+            std::vector<std::string>::iterator iter1;
+            iter1 = find(current_scopes.begin(), current_scopes.end(), localId_id_m[keyword_child.id + kw]);
+            if (iter1 != current_scopes.end()) // don't add as keyword if already added as declared
+                continue;
+
+            keych.set_local_id(keyword_child.id + ":" + kw);
+            type_ids_m[kw].emplace_back(keych.local_id());
             d.keyword = kw;
             keych.set_department(kw);
             keych.set_keyword(kw);
@@ -930,10 +934,10 @@
         if (curr_dept_id.empty())
             curr_dept_id = "root";
         qWarning() << "==== ID 2 KEYWORD: " << qstr(keych.keyword());
-        qWarning () << QString("%1: ADDING KEYWORD child scope: %2 by keyword %3 to department: %4").arg(qstr(scope_id), qstr(keych.id()), qstr(keych.keyword()), qstr(curr_dept_id));
-        scopes_m[keych.id()] = std::make_shared<AggChildScope>(keych);
-        localId_id_m[keych.id()] = keych.id();
-        current_scopes.emplace_back(keych.id());
+        qWarning () << QString("%1: ADDING KEYWORD child scope: %2, local_id %5, by keyword %3, to department: %4").arg(qstr(scope_id), qstr(keych.id()), qstr(keych.keyword()), qstr(curr_dept_id), qstr(keych.local_id()));
+        scopes_m[keych.local_id()] = std::make_shared<AggChildScope>(keych);
+        localId_id_m[keych.local_id()] = keych.id();
+        current_scopes.emplace_back(keych.local_id());
     }
 }