Merge lp:~gary-wzl77/scope-aggregator/fix_1509307 into lp:scope-aggregator

[Gary.Wang]

Bug fixed for invalid argument exceptioh when call set_category.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-23 11:06:31 +0000
+++ CMakeLists.txt	2015-10-23 11:06:31 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.0")
+set(VERSION "4.1")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2015-10-23 11:06:31 +0000
+++ src/query.cpp	2015-10-23 11:06:31 +0000
@@ -444,13 +444,13 @@
                         if (keyword_catname_search_renderer.find(keyword) != keyword_catname_search_renderer.end()) // keyword has declared cat search renderer
                         {
                             qDebug() << "==== SEARCH keyword using search renderer";
-                            cat_id = scope->local_id() + ":keyword:shared_cat:search_renderer::search";
+                            cat_id = scope->local_id() + ":keyword:shared_cat:search_renderer::search" + cat_title;
                             rdr = keyword_catname_search_renderer[keyword];
                         }
                         else
                         {
                             qDebug() << "==== SEARCH using incoming result renderer";
-                            cat_id = scope->local_id() + ":keyowrd:shared_cat:incoming_renderer::search";
+                            cat_id = scope->local_id() + ":keyowrd:shared_cat:incoming_renderer::search" + cat_title;
                             rdr = inc_res_rdr;
                         }
                         if (!upstream_reply->lookup_category(cat_id))
@@ -475,7 +475,7 @@
                                 first_result_owner = keyword;
                                 qDebug() << "==== KW RESULT is FIRST result: " << qstr(scope->keyword_scope_shared_cat_name());
                                 qDebug() << "==== KW RESULT claims FIRST result: " << qstr(scope->keyword_scope_shared_cat_name());
-                                cat_id = keyword + ":keyword:is_shared_category:is_first_result";
+                                cat_id = keyword + ":keyword:is_shared_category:is_first_result" + cat_title;
                                 rdr = keyword_catname_first_result_renderers[keyword];
                                 keywordSharedCat_isFirstResult[keyword] = false;
                                 keywordSharedCat_isSecondResult[keyword] = true;
@@ -497,13 +497,13 @@
                                 if (keyword_catname_renderer.find(keyword) != keyword_catname_renderer.end()) // keyword has declared cat renderer
                                 {
                                     qDebug() << "==== KW RESULT uses FIRST result. is SECOND result. uses surface_template ";
-                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:second_result:surface_template";
+                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:second_result:surface_template" + cat_title;
                                     rdr = keyword_catname_renderer[keyword];
                                 }
                                 else // use result template
                                 {
                                     qDebug() << "==== KW RESULT uses FIRST result. is SECOND result. NOT uses serface_template ";
-                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:second_result:result_template";
+                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:second_result:result_template"  + cat_title;
                                     rdr = res.category()->renderer_template().data();
                                 }
                                 if (!upstream_reply->lookup_category(cat_id))
@@ -526,7 +526,7 @@
                                 qDebug() << "==== KW RESULT uses FIRST result. other claims it.. uses surface_template ";
                                 if (catname_catptr.find(keyword) == catname_catptr.end())
                                 {
-                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:other_claims_it:surface_template";
+                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:other_claims_it:surface_template" + cat_title;
                                     rdr = keyword_catname_renderer[keyword];
                                     if (!upstream_reply->lookup_category(cat_id))
                                     {
@@ -545,7 +545,7 @@
                                 qDebug() << "==== KW RESULT uses FIRST result. other claims it. uses result template ";
                                 if (catname_catptr.find(keyword) == catname_catptr.end())
                                 {
-                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:other_claims_it:result_template";
+                                    cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:uses_first_result:other_claims_it:result_template" + cat_title;
                                     rdr = res.category()->renderer_template().data();
                                     if (!upstream_reply->lookup_category(cat_id))
                                     {
@@ -567,14 +567,14 @@
                         if (!scope->surface_template().empty())// has a decared surface template
                         {
                             qDebug() << "==== KW RESULT not uses first result. uses surface template";
-                            cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:not_uses_first_result:surface_template";
+                            cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:not_uses_first_result:surface_template"  + cat_title;
                             qDebug() << "==== KW RESULT not uses first result. uses surface template. surface temlate: " << qstr(scope->surface_template()).replace("\n", " ");
                             rdr = scope->surface_template();
                         }
                         else // use result template
                         {
                             qDebug() << "==== KW RESULT not uses first result. NOT uses surface template";
-                            cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:not_uses_first_result:result_template";
+                            cat_id = scope->keyword_scope_shared_cat_name() + ":keyword:is_shared_category:not_uses_first_result:result_template"  + cat_title;
                             rdr = res.category()->renderer_template().data();
                         }
                         if (catname_catptr.find(keyword) == catname_catptr.end())
@@ -627,13 +627,13 @@
                         if (keyword_catname_renderer.find(keyword) != keyword_catname_renderer.end()) // keyword has declared cat renderer
                         {
                             qDebug() << "==== KW RESULT not shared declared renderer ";
-                            cat_id = scope->keyword() + ":keyword:not_shared_category:declared_renderer";
+                            cat_id = scope->keyword() + ":keyword:not_shared_category:declared_renderer"  + cat_title;
                             rdr = keyword_catname_renderer[keyword];
                         }
                         else // use result template
                         {
                             qDebug() << "==== KW RESULT not shared incoming renderer";
-                            cat_id = scope->keyword() + ":keyword:not_shared_category:incoming_renderer";
+                            cat_id = scope->keyword() + ":keyword:not_shared_category:incoming_renderer" + cat_title;
                             rdr = res.category()->renderer_template().data();
                         }
                         if (!upstream_reply->lookup_category(cat_id))
@@ -692,13 +692,13 @@
                     if (!scope->search_template().empty())
                     {
                         qDebug() << "==== CATREG keyword using search renderer";
-                        cat_id = scope->local_id() + ":category:search_renderer::search";
+                        cat_id = scope->local_id() + ":category:search_renderer::search" + cat_title;
                         rdr = scope->search_template();
                     }
                     else
                     {
                         qDebug() << "==== CATREG using incoming result renderer";
-                        cat_id = scope->local_id() + ":category:incoming_renderer::search";
+                        cat_id = scope->local_id() + ":category:incoming_renderer::search" + cat_title;
                         rdr = inc_res_rdr;
                     }
                     if (!upstream_reply->lookup_category(cat_id))
@@ -731,7 +731,7 @@
                             first_result_owner = category_id;
                             qDebug() << "==== CATREG RESULT is FIRST result: " << qstr(scope->category_id());
                             qDebug() << "==== CATREG RESULT claims FIRST result: " << qstr(scope->category_id());
-                            cat_id = category_id + ":category:is_first_result";
+                            cat_id = category_id + ":category:is_first_result" + cat_title;
                             rdr = categoryId_first_result_renderers[category_id];
                             categoryId_isFirstResult[category_id] = false;
                             categoryId_isSecondResult[category_id] = true;
@@ -773,14 +773,14 @@
                             qDebug()<<"==== CATREG SURFACE: " << qstr(scope->surface_template()).replace("\n"," ");
                             if (!scope->surface_template().empty()) // keyword has declared cat renderer
                             {
-                                qDebug() << "==== CATREG R=ESULT uses FIRST result. is SECOND result. uses surface_renderer ";
-                                cat_id = category_id + ":category:uses_first_result:second_result:surface_template";
+                                qDebug() << "==== CATREG RESULT uses FIRST result. is SECOND result. uses surface_renderer ";
+                                cat_id = category_id + ":category:uses_first_result:second_result:surface_template" + cat_title;
                                 rdr = scope->surface_template();
                             }
                             else // use result template
                             {
                                 qDebug() << "==== CATREG RESULT uses FIRST result. is SECOND result. NOT uses surface_template ";
-                                cat_id = category_id + ":category:uses_first_result:second_result:result_template";
+                                cat_id = category_id + ":category:uses_first_result:second_result:result_template" + cat_title;
                                 rdr = res.category()->renderer_template().data();
                             }
                             if (!upstream_reply->lookup_category(cat_id))
@@ -808,7 +808,7 @@
                                 qDebug() << "==== CATREG RESULT uses FIRST result. other claims it. using surface_template ";
                                 if (catname_catptr.find(category_id) == catname_catptr.end())
                                 {
-                                    cat_id = category_id + ":category:uses_first_result:other_claims_it:surface_template";
+                                    cat_id = category_id + ":category:uses_first_result:other_claims_it:surface_template" + cat_title;
                                     rdr = categoryId_renderer[category_id];
                                     if (!upstream_reply->lookup_category(cat_id))
                                     {
@@ -827,7 +827,7 @@
                                 qDebug() << "==== CATREG RESULT uses FIRST result. other claims it. uses result template ";
                                 if (catname_catptr.find(category_id) == catname_catptr.end())
                                 {
-                                    cat_id = category_id + ":category:uses_first_result:other_claims_it:result_template";
+                                    cat_id = category_id + ":category:uses_first_result:other_claims_it:result_template" + cat_title;
                                     rdr = res.category()->renderer_template().data();
                                     if (!upstream_reply->lookup_category(cat_id))
                                     {
@@ -854,11 +854,10 @@
                        check_result_fallbacks(res, scope->surface_common_template_id());
                     }
 
-
                     if (!scope->surface_template().empty())// has a decared surface template
                     {
                         qDebug() << "==== CATREG RESULT not uses first result. uses surface template";
-                        cat_id = scope->category_id() + ":category:not_uses_first_result:surface_template";
+                        cat_id = scope->category_id() + ":category:not_uses_first_result:surface_template" + cat_title;
                         qDebug() << "==== CATREG RESULT not uses first result. uses surface template. surface temlate: " << qstr(scope->surface_template()).replace("\n", " ");
                         rdr = scope->surface_template();
                     }
@@ -866,7 +865,7 @@
                     {
                         qDebug() << "==== CATREG RESULT not uses first result. NOT uses surface template";
                         qDebug() << "==== CATREG RESULT not uses first result. does use incoming result (not impld yet): " << qstr(category_id);
-                        cat_id = scope->keyword_scope_shared_cat_name() + ":category:not_uses_first_result:result_template";
+                        cat_id = scope->keyword_scope_shared_cat_name() + ":category:not_uses_first_result:result_template" + cat_title;
                         rdr = res.category()->renderer_template().data();
                     }
                     if (catname_catptr.find(category_id) == catname_catptr.end())
@@ -945,7 +944,7 @@
 
                     cat_title = scope->category_title();
 
-                    cat_id = scope->id() + ":declared_default";
+                    cat_id = scope->id() + ":declared_default" + cat_title;
 
                     qDebug() << "==== first_result_owner: " << qstr(first_result_owner);
 
@@ -955,19 +954,19 @@
                         if (!scope->search_template().empty())
                         {
                             qDebug() << "==== FIRST RESULT: SEARCH using search renderer";
-                            cat_id = scope->local_id() + ":declared:first_result:search_renderer::search";
+                            cat_id = scope->local_id() + ":declared:first_result:search_renderer::search" + cat_title;
                             rdr = scope->search_template();
                         }
                         else if (!scope->surface_template().empty())
                         {
                             qDebug() << "==== FIRST RESULT: SEARCH using surface renderer";
-                            cat_id = scope->local_id() + ":declared:first_result:surface_renderer::search";
+                            cat_id = scope->local_id() + ":declared:first_result:surface_renderer::search" + cat_title;
                             rdr = scope->surface_template();
                         }
                         else
                         {
                             qDebug() << "==== FIRST RESULT: SEARCH using incoming result renderer";
-                            cat_id = scope->local_id() + ":declared:first_result:incomiing_renderer::search";
+                            cat_id = scope->local_id() + ":declared:first_result:incomiing_renderer::search" + cat_title;
                             rdr = inc_res_rdr;
                         }
                     }
@@ -977,31 +976,31 @@
                         if (!scope->first_result_template().empty())
                         {
                             qDebug() << "==== FIRST RESULT: using first result template";
-                            cat_id = scope->local_id() + ":declared:first_result:first_result_template::surface";
+                            cat_id = scope->local_id() + ":declared:first_result:first_result_template::surface" + cat_title;
                             rdr = scope->first_result_template();
                         }
                         else if (!scope->surface_template().empty())
                         {
-                            cat_id = scope->local_id() + ":declared:first_result:surface_template::surface";
+                            cat_id = scope->local_id() + ":declared:first_result:surface_template::surface" + cat_title;
                             rdr = scope->surface_template();
                             qDebug() << "==== FIRST RESULT: using surface template";
                         }
                         else
                         {
-                            cat_id = scope->local_id() + ":declared:first_result:incoming_template::surface";
+                            cat_id = scope->local_id() + ":declared:first_result:incoming_template::surface" + cat_title;
                             rdr = inc_res_rdr;
                             qDebug() << "==== FIRST RESULT: using incoming template";
                         }
                     }
                     else if (!scope->surface_template().empty())
                     {
-                        cat_id = scope->local_id() + ":declared:first_result:surface_template::surface";
+                        cat_id = scope->local_id() + ":declared:first_result:surface_template::surface" + cat_title;
                         rdr = scope->surface_template();
                         qDebug() << "==== FIRST RESULT: using surface template";
                     }
                     else
                     {
-                        cat_id = scope->local_id() + ":declared:first_result:incoming_template::surface";
+                        cat_id = scope->local_id() + ":declared:first_result:incoming_template::surface" + cat_title;
                         rdr = inc_res_rdr;
                         qDebug() << "==== FIRST RESULT: using incoming template";
                     }
@@ -1038,12 +1037,12 @@
                             qDebug() << " CAT: scope->category_title(): " << qstr(scope->category_title());
                             if (scope->override_surface_template()) // use declared renderer
                             {
-                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:surface_template:surface";
+                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:surface_template:surface" + cat_title;
                                 rdr = scope->surface_template();
                             }
                             else // use incoming renderer
                             {
-                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:incoming_template:surface";
+                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:incoming_template:surface" + cat_title;
                                 rdr = inc_res_rdr;
                             }
                         }
@@ -1051,12 +1050,12 @@
                         {
                             if (scope->override_search_template())
                             {
-                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:search_template:search";
+                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:search_template:search" + cat_title;
                                 rdr = scope->search_template().data();
                             }
                             else
                             {
-                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:incoming_template:search";
+                                cat_id = scope->local_id() + ":declared:not_first_result:link-override:incoming_template:search" + cat_title;
                                 rdr = inc_res_rdr;
                             }
                         }
@@ -1067,12 +1066,12 @@
                         {
                             if (scope->override_surface_template())
                             {
-                                cat_id = scope->local_id() + "_nolink-override-surface";
+                                cat_id = scope->local_id() + "_nolink-override-surface" + cat_title;
                                 rdr = scope->surface_template().data();
                             }
                             else if (!scope->first_result_template().empty())
                             {
-                                cat_id = scope->local_id() + "_nolink-nooverride-surface";
+                                cat_id = scope->local_id() + "_nolink-nooverride-surface" + cat_title;
                                 rdr = inc_res_rdr;;
                             }
                         }
@@ -1080,12 +1079,12 @@
                         {
                             if (scope->override_search_template())
                             {
-                                cat_id = scope->local_id() + "_nolink-override-search";
+                                cat_id = scope->local_id() + "_nolink-override-search" + cat_title;
                                 rdr = scope->search_template().data();
                             }
                             else
                             {
-                                cat_id = scope->local_id() + "_nolink-nooverride-search";
+                                cat_id = scope->local_id() + "_nolink-nooverride-search" + cat_title;
                                 rdr = inc_res_rdr;;
                             }
                         }
@@ -1151,7 +1150,7 @@
                 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() + cat_title;
 
                     // if the common category has not yet been registered, register it
                     if (!upstream_reply->lookup_category(cat_id))