Merge lp:~knitzsche/scope-aggregator/fixes-bug-1549844-runtime-scopeid-in-log-always into lp:scope-aggregator

[Kyle Nitzsche]

always use runtime agg scope id in log messages.

https://bugs.launchpad.net/scope-aggregator/+bug/1549844

[Kyle Nitzsche (knitzsche)]

Because this is a trivial change, and because it has been a week with no review, I am going to merge it so that I can produce a new release of scope-aggregator that includes other changes so that I can rebase photos-agg and today-agg on it for ota 10.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-09 16:11:02 +0000
+++ CMakeLists.txt	2016-02-25 15:21:01 +0000
@@ -1,4 +1,4 @@
-set(VERSION "4.2.1")
+set(VERSION "4.2.2")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )

=== modified file 'src/query.cpp'
--- src/query.cpp	2015-12-02 22:19:12 +0000
+++ src/query.cpp	2016-02-25 15:21:01 +0000
@@ -242,7 +242,7 @@
         create_departments(upstream_reply);
     }
     else
-        qWarning () << QString("%1: NOT using departments").arg(qstr(SCOPE_ID));
+        qWarning () << QString("%1: NOT using departments").arg(qstr(scope_id));
 
     // set up handling for results and handle them, including buffering to ensure order
     handle_child_scope_results(query_string, empty_search, upstream_reply);
@@ -301,7 +301,7 @@
         us::MetadataMap::const_iterator scope_it;
         scope_it = reg_scopes.find(localId_id_m[local_id]);
         if (scope_it == reg_scopes.end()) {
-            qWarning () << QString("%1: scope is NOT REGISTERED, skipping: %2").arg(qstr(SCOPE_ID), qstr(localId_id_m[local_id]));
+            qWarning () << QString("%1: scope is NOT REGISTERED, skipping: %2").arg(qstr(scope_id), qstr(localId_id_m[local_id]));
             continue;
         }
 
@@ -332,7 +332,7 @@
 
         if (!found_as_enabled)
         {
-            qWarning () << QString("%1: scope is NOT ENABLED, skipping: %2").arg(qstr(SCOPE_ID), qstr(localId_id_m[local_id]));
+            qWarning () << QString("%1: scope is NOT ENABLED, skipping: %2").arg(qstr(scope_id), qstr(localId_id_m[local_id]));
             continue;
         }