Merge lp:~zhangew401/scope-aggregator/fix-lp-1604212 into lp:scope-aggregator

[Zhang Enwei]

Please check the bug report,
https://bugs.launchpad.net/scope-aggregator/+bug/1604212
Thanks.

[Gary.Wang (gary-wzl77)]

Thanks for this merge proposal.
It looks good to me.

P.S.
I think this issue was introduced by this MP
https://code.launchpad.net/~gary-wzl77/scope-aggregator/4.8-opt
Sorry.

review: Approve

[Kyle Nitzsche (knitzsche)]

LGTM - thanks

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-07 21:53:05 +0000
+++ CMakeLists.txt	2016-07-19 02:03:53 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.9")
+set(VERSION "4.10")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )

=== modified file 'src/utils.cpp'
--- src/utils.cpp	2016-07-07 21:03:37 +0000
+++ src/utils.cpp	2016-07-19 02:03:53 +0000
@@ -280,14 +280,20 @@
                     {
                         QString child_dept = scope_o[QStringLiteral("child_department")].toString();
 
-                        if (agg_scope_->lang().size() == 2 && child_dept.contains(QStringLiteral("LANGCODE")))
+                        if (agg_scope_->lang().size() == 2)
                         {
-                            child_dept = child_dept.replace(QStringLiteral("LANGCODE"), qstr(agg_scope_->lang()));
+                            if (child_dept.contains(QStringLiteral("LANGCODE")))
+                            {
+                                child_dept = child_dept.replace(QStringLiteral("LANGCODE"), qstr(agg_scope_->lang()));
+                            }
                             scopeLocalId_childDept_m[local_id] = child_dept.toStdString();
                         }
-                        if (agg_scope_->country().size() == 2 && child_dept.contains(QStringLiteral("COUNTRYCODE")))
+                        if (agg_scope_->country().size() == 2)
                         {
-                            child_dept = child_dept.replace(QStringLiteral("COUNTRYCODE"), qstr(agg_scope_->country()));
+                            if (child_dept.contains(QStringLiteral("COUNTRYCODE")))
+                            {
+                                child_dept = child_dept.replace(QStringLiteral("COUNTRYCODE"), qstr(agg_scope_->country()));
+                            }
                             scopeLocalId_childDept_m[local_id] = child_dept.toStdString();
                         }
                         qDebug() << qstr("=== CHDEPT. lang: %1 local %2. dept %3").arg(qstr(agg_scope_->lang()),