Merge lp:~knitzsche/scope-aggregator/register-category-bug-1492428 into lp:scope-aggregator

[Kyle Nitzsche]

don't try to register a category that is already registered (one case of that found). And timestamp that category_id in that case too (as is done generally).

[Gary.Wang (gary-wzl77)]

I can't reproduce it either.but according to registery.log in bug description, exception is caused by duplicated category.And appending current date-time string at category id is good trick.
Thanks.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-28 15:23:48 +0000
+++ CMakeLists.txt	2015-09-04 20:16:43 +0000
@@ -1,4 +1,4 @@
-set(VERSION "1.5.26")
+set(VERSION "1.5.26.1")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )

=== modified file 'src/query.cpp'
--- src/query.cpp	2015-08-18 18:35:08 +0000
+++ src/query.cpp	2015-09-04 20:16:43 +0000
@@ -1108,10 +1108,10 @@
                 if (common_templates.find(child_scopes_m[scope->local_id()]->result_category_id_to_common_template[res.category()->id()]) != common_templates.end())
                 {
                     std::string common_template_id = child_scopes_m[scope->local_id()]->result_category_id_to_common_template[res.category()->id()];
-                    std::string cat_id = common_template_id + scope->local_id();
+                    std::string cat_id = common_template_id + ":" + scope->local_id() + ":" + QDateTime::currentDateTime().toString(dateformat).toStdString();
 
                     // if the common category has not yet been registered, register it
-                    if (registered_common_categories.find(cat_id) == registered_common_categories.end())
+                    if (!upstream_reply->lookup_category(cat_id))
                     {
                         std::string template_to_use = common_templates[child_scopes_m[scope->local_id()]->result_category_id_to_common_template[res.category()->id()]];
                         if (scope->category_link_to_child())