Merge lp:~xavi-garcia-mena/go-unityscopes/go-subsearch into lp:go-unityscopes/v2

[Xavi Garcia]

This branch adds full functionality to implement aggregated scopes in go.
It implements the subsearch method from SearchQueryBase.

The branch also includes scope-harness to verify aggregated scopes.

This branch adds full functionality to implement aggregated scopes in go.
It implements the subsearch method from SearchQueryBase.

The branch also includes scope-harness to verify aggregated scopes.

[lp:~xavi-garcia-mena/go-unityscopes/go-subsearch]

76. By Xavi Garcia on 2015-05-25

Fixed typo and removed commented include

77. By Xavi Garcia on 2015-05-26

Removed some comments

78. By Xavi Garcia on 2015-05-26

Hide wait mechanism for child scopes to the developer. Now Aggregated scopes wait by default transparently

79. By Xavi Garcia on 2015-05-26

Removed binary

[James Henstridge (jamesh)]

I've left some inline comments. The main conceptual problem I see is tying the Subsearch API to the ScopeBase class, with other issues stemming from that (e.g. the WaitGroup on ScopeBase).

review: Needs Fixing

[lp:~xavi-garcia-mena/go-unityscopes/go-subsearch]

80. By Xavi Garcia on 2015-06-09

Moved Subsearch to SearchReply. Passed go fmt to the test files. NOTE: This branch is still work in progress, it's not fully functional

81. By Xavi Garcia on 2015-06-09

Moved subsearch method to SeachReply. Working version

82. By Xavi Garcia on 2015-06-10

Removed SetSearchReply and GetSearchReply from the subsearch listener, as they are no longer needed

83. By Xavi Garcia on 2015-06-10

Added Finished method to SearchListener. Some functions moved from goscope.go to reply.go.

[Kyle Fazzari (kyrofa)]

A few little things, comments inline.

review: Needs Fixing

[lp:~xavi-garcia-mena/go-unityscopes/go-subsearch]

84. By Xavi Garcia on 2015-06-17

added suggested changes

[Xavi Garcia (xavi-garcia-mena)]

Thanks for the review Kyle!

There is no reason to not use const & in the parameters, so I've add it :).

Regarding making the members private I didn't add it because that's a class in a cpp file that cannot be accessed from anywhere but that file.

I've added the private as it doesn't harm ;).

[Kyle Fazzari (kyrofa)]

Looks good to me!

Hmm, that class being inaccessible to others must be an artifact of cgo, then? Since it's not wrapped in an anonymous namespace? Regardless, encapsulation is still a best-practice, even if you're the only one using it :) . Worst case, it doesn't hurt; best case, it catches a mistake later.

review: Approve

Unmerged revisions

84. By Xavi Garcia on 2015-06-17

added suggested changes

83. By Xavi Garcia on 2015-06-10

Added Finished method to SearchListener. Some functions moved from goscope.go to reply.go.

82. By Xavi Garcia on 2015-06-10

Removed SetSearchReply and GetSearchReply from the subsearch listener, as they are no longer needed

81. By Xavi Garcia on 2015-06-09

Moved subsearch method to SeachReply. Working version

80. By Xavi Garcia on 2015-06-09

Moved Subsearch to SearchReply. Passed go fmt to the test files. NOTE: This branch is still work in progress, it's not fully functional

79. By Xavi Garcia on 2015-05-26

Removed binary

78. By Xavi Garcia on 2015-05-26

Hide wait mechanism for child scopes to the developer. Now Aggregated scopes wait by default transparently

77. By Xavi Garcia on 2015-05-26

Removed some comments

76. By Xavi Garcia on 2015-05-25

Fixed typo and removed commented include

75. By Xavi Garcia on 2015-05-25

Added Subsearch method to retrieve results from child scopes. Added scope-harness tests for aggregated scopes

=== modified file 'metadata_test.go'
--- metadata_test.go	2015-05-21 14:58:07 +0000
+++ metadata_test.go	2015-06-17 07:29:19 +0000
@@ -170,6 +170,6 @@
 	c.Check(pageHeader["background"], Equals, "color:///#ffffff")
 	c.Check(pageHeader["divider-color"], Equals, "#b31217")
 	c.Check(pageHeader["logo"], Equals, "unity-scope-youtube/build/src/logo.png")
-	
-	c.Check(scopeMetadata.Keywords, DeepEquals, []string{"music","video"})
+
+	c.Check(scopeMetadata.Keywords, DeepEquals, []string{"music", "video"})
 }

=== modified file 'reply.cpp'
--- reply.cpp	2015-03-25 07:46:21 +0000
+++ reply.cpp	2015-06-17 07:29:19 +0000
@@ -2,19 +2,50 @@
 #include <cstring>
 #include <iostream>
 
+#include <unity/scopes/ChildScope.h>
 #include <unity/scopes/PreviewReply.h>
+#include <unity/scopes/SearchListenerBase.h>
+#include <unity/scopes/SearchReplyProxyFwd.h>
 #include <unity/scopes/SearchReply.h>
 #include <unity/scopes/Version.h>
 
 extern "C" {
 #include "_cgo_export.h"
 }
+#include "scope.h"
 #include "helpers.h"
 #include "smartptr_helper.h"
 
 using namespace unity::scopes;
 using namespace gounityscopes::internal;
 
+class ResultForwarder : public SearchListenerBase
+{
+public:
+    ResultForwarder(GoInterface const& listener, GoInterface const& goreply, SearchReplyProxy const& upstream)
+        : SearchListenerBase()
+         , listener_(listener)
+         , reply_(goreply)
+         , upstream_(upstream){
+    }
+
+    void push(unity::scopes::CategorisedResult result) override {
+        if (callFilterResult(listener_, reinterpret_cast<_CategorisedResult*>(static_cast<Result*>(&result)))) {
+            upstream_->push(result);
+        }
+    }
+
+    virtual void finished(CompletionDetails const& details) override {
+        callSearchListenerFinished(reply_);
+        callListenerFinished(listener_);
+    }
+
+private:
+    GoInterface listener_;
+    GoInterface reply_;
+    SearchReplyProxy upstream_;
+};
+
 void init_search_reply_ptr(SharedPtrData dest, SharedPtrData src) {
     std::shared_ptr<SearchReply> reply = get_ptr<SearchReply>(src);
     init_ptr<SearchReply>(dest, reply);
@@ -76,6 +107,21 @@
 #endif
 }
 
+void search_reply_subsearch(_ChildScope *child_scope, void *query, void *department_id,  _SearchMetadata *metadata,
+                          SharedPtrData reply, _SearchQueryBase *search_query_base, void *pointer_to_iface, void *pointer_to_go_reply) {
+    ChildScope *c_child_scope = reinterpret_cast<ChildScope*>(child_scope);
+    std::string c_query = from_gostring(query);
+    std::string c_department_id = from_gostring(department_id);
+    SearchMetadata *c_metadata = reinterpret_cast<SearchMetadata*>(metadata);
+    auto c_reply = get_ptr<SearchReply>(reply);
+    SearchQueryBase *c_search_query_base = reinterpret_cast<SearchQueryBase*>(search_query_base);
+    GoInterface *listener = reinterpret_cast<GoInterface*>(pointer_to_iface);
+    GoInterface *go_reply = reinterpret_cast<GoInterface*>(pointer_to_go_reply);
+
+    auto forwarder = std::make_shared<ResultForwarder>(*listener, *go_reply, c_reply);
+    c_search_query_base->subsearch(*c_child_scope, c_query, c_department_id, FilterState(), *c_metadata, forwarder);
+}
+
 void init_preview_reply_ptr(SharedPtrData dest, SharedPtrData src) {
     std::shared_ptr<PreviewReply> reply = get_ptr<PreviewReply>(src);
     init_ptr<PreviewReply>(dest, reply);

=== modified file 'reply.go'
--- reply.go	2015-03-25 08:14:19 +0000
+++ reply.go	2015-06-17 07:29:19 +0000
@@ -6,18 +6,35 @@
 import (
 	"encoding/json"
 	"runtime"
+	"sync"
 	"unsafe"
 )
 
+type childScopeSubsearchSync interface {
+	finishSubsearch()
+	waitForChildScopesFinished()
+}
+
 // SearchReply is used to send results of search queries to the client.
 type SearchReply struct {
-	r C.SharedPtrData
-}
-
-func makeSearchReply(replyData *C.uintptr_t) *SearchReply {
+	r         C.SharedPtrData
+	s         *C._SearchQueryBase
+	waitGroup sync.WaitGroup
+}
+
+func (reply *SearchReply) finishSubsearch() {
+	reply.waitGroup.Done()
+}
+
+func (reply *SearchReply) waitForChildScopesFinished() {
+	reply.waitGroup.Wait()
+}
+
+func makeSearchReply(replyData *C.uintptr_t, searchQueryBase *C._SearchQueryBase) *SearchReply {
 	reply := new(SearchReply)
 	runtime.SetFinalizer(reply, finalizeSearchReply)
 	C.init_search_reply_ptr(&reply.r[0], replyData)
+	reply.s = searchQueryBase
 	return reply
 }
 
@@ -99,6 +116,36 @@
 	return checkError(errorString)
 }
 
+// Subsearch method is used by aggregating scopes.
+// When an aggregator passes a query to its child scopes, it should
+// use Subsearch() instead of the normal Search()
+// that would be called by a client. Subsearch() takes care
+// of automatically forwarding query cancellation to child scopes.
+// This means that there is no need for an aggregating scope to
+// explicitly forward cancellation to child scopes.
+func (reply *SearchReply) Subsearch(childScope *ChildScope, query string, departmentId string, metadata *SearchMetadata, searchListener SearchListener) {
+	reply.waitGroup.Add(1)
+	var syncInterface childScopeSubsearchSync
+	syncInterface = reply
+	C.search_reply_subsearch(childScope.c, unsafe.Pointer(&query), unsafe.Pointer(&departmentId), (*C._SearchMetadata)(metadata.m), &reply.r[0], reply.s, unsafe.Pointer(&searchListener), unsafe.Pointer(&syncInterface))
+}
+
+//export callSearchListenerFinished
+func callSearchListenerFinished(reply childScopeSubsearchSync) {
+	reply.finishSubsearch()
+}
+
+//export callFilterResult
+func callFilterResult(listener SearchListener, result *C._CategorisedResult) bool {
+	goresult := makeCategorisedResult(result)
+	return listener.FilterResult(goresult)
+}
+
+//export callListenerFinished
+func callListenerFinished(listener SearchListener) {
+	listener.Finished()
+}
+
 // PreviewReply is used to send result previews to the client.
 type PreviewReply struct {
 	r C.SharedPtrData

=== modified file 'result.cpp'
--- result.cpp	2015-03-02 05:43:42 +0000
+++ result.cpp	2015-06-17 07:29:19 +0000
@@ -47,3 +47,12 @@
 void result_set_intercept_activation(_Result *res) {
     reinterpret_cast<Result*>(res)->set_intercept_activation();
 }
+
+void result_set_category(_Result *res, SharedPtrData category) {
+    Result *result = reinterpret_cast<Result*>(res);
+    CategorisedResult *cat_result = dynamic_cast<CategorisedResult*>(result);
+    if (cat_result) {
+        auto cat = get_ptr<Category>(category);
+        cat_result->set_category(cat);
+    }
+}

=== modified file 'result.go'
--- result.go	2015-03-23 11:16:52 +0000
+++ result.go	2015-06-17 07:29:19 +0000
@@ -142,3 +142,15 @@
 func finalizeCategorisedResult(res *CategorisedResult) {
 	finalizeResult(&res.Result)
 }
+
+func makeCategorisedResult(res *C._Result) *CategorisedResult {
+	result := new(CategorisedResult)
+	runtime.SetFinalizer(result, finalizeCategorisedResult)
+	result.result = res
+	return result
+}
+
+// SetCategory Updates the category of this result.
+func (res *CategorisedResult) SetCategory(category *Category) {
+	C.result_set_category(res.result, &category.c[0])
+}

=== modified file 'scope.cpp'
--- scope.cpp	2015-06-17 07:29:19 +0000
+++ scope.cpp	2015-06-17 07:29:19 +0000
@@ -1,11 +1,15 @@
 #include <unity/scopes/Category.h>
+#include <unity/scopes/utility/BufferedResultForwarder.h>
 extern "C" {
 #include "_cgo_export.h"
 }
 #include "scope.h"
+#include "helpers.h"
 #include "smartptr_helper.h"
 
 using namespace unity::scopes;
+using namespace gounityscopes::internal;
+using namespace unity::scopes::utility;
 
 ScopeAdapter::ScopeAdapter(GoInterface goscope) : goscope(goscope) {
 }
@@ -40,9 +44,9 @@
 }
 
 ChildScopeList ScopeAdapter::find_child_scopes() const {
-    ChildScopeList child_scopes;
     GoSlice go_slice = callFindChildScopes(goscope);
     ChildScope **data = reinterpret_cast<ChildScope **>(go_slice.data);
+    ChildScopeList child_scopes;
     for(uint i = 0;i < go_slice.len; ++i)
     {
         ChildScope child_scope(data[i]->id, data[i]->metadata, data[i]->enabled, data[i]->keywords);
@@ -68,6 +72,7 @@
         reinterpret_cast<_CannedQuery*>(new CannedQuery(query())),
         reinterpret_cast<_SearchMetadata*>(new SearchMetadata(search_metadata())),
         const_cast<uintptr_t*>(reinterpret_cast<const uintptr_t*>(&reply)),
+        reinterpret_cast<_SearchQueryBase*>(this),
         cancel_channel.get());
 }
 

=== modified file 'shim.h'
--- shim.h	2015-06-17 07:29:19 +0000
+++ shim.h	2015-06-17 07:29:19 +0000
@@ -20,6 +20,7 @@
 typedef struct _QueryMetadata _QueryMetadata;
 typedef struct _ColumnLayout _ColumnLayout;
 typedef struct _ChildScope _ChildScope;
+typedef struct _SearchQueryBase _SearchQueryBase;
 typedef void _ScopeBase;
 typedef struct _GoString _GoString;
 
@@ -52,6 +53,7 @@
 void search_reply_register_departments(SharedPtrData reply, SharedPtrData dept);
 void search_reply_push(SharedPtrData reply, _CategorisedResult *result, char **error);
 void search_reply_push_filters(SharedPtrData reply, void *filters_json, void *filter_state_json, char **error);
+void search_reply_subsearch(_ChildScope *child_scope, void *query, void *department_id, _SearchMetadata *metadata, SharedPtrData reply, _SearchQueryBase *query_base, void *pointer_to_iface, void *pointer_to_go_reply);
 
 /* PreviewReply objects */
 void init_preview_reply_ptr(SharedPtrData dest, SharedPtrData src);
@@ -80,6 +82,7 @@
 /* CategorisedResult objects */
 _Result *new_categorised_result(SharedPtrData category);
 void destroy_result(_Result *res);
+void result_set_category(_Result *res, SharedPtrData category);
 
 /* Result objects */
 void *result_get_attr(_Result *res, void *attr, int *length, char **error);

=== added directory 'tests/aggregated'
=== added file 'tests/aggregated/aggregated.go'
--- tests/aggregated/aggregated.go	1970-01-01 00:00:00 +0000
+++ tests/aggregated/aggregated.go	2015-06-17 07:29:19 +0000
@@ -0,0 +1,141 @@
+package main
+
+import (
+    "fmt"
+    "launchpad.net/go-unityscopes/v2"
+    "log"
+)
+
+const searchCategoryTemplate = `{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art":  "art",
+    "subtitle": "username"
+  }
+}`
+
+const searchCategoryTemplate2 = `{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art":  "art",
+    "subtitle": "username"
+  }
+}`
+
+// SCOPE ***********************************************************************
+
+var scope_interface scopes.AggregatedScope
+
+type MyScope struct {
+    base *scopes.ScopeBase
+}
+
+type TestScopeListener struct {
+    category *scopes.Category
+    id string
+
+}
+
+func NewTestScopeListener(id string, category *scopes.Category) *TestScopeListener {
+    listener := new(TestScopeListener)
+    listener.SetCategory(category)
+    listener.id = id
+    return listener
+}
+
+func (l *TestScopeListener) SetCategory(category *scopes.Category) {
+    l.category = category
+}
+
+func (l *TestScopeListener) Finished() {
+    fmt.Printf("SUBSEARCH [%s] FINISHED\n", l.id)
+}
+
+func (l *TestScopeListener) FilterResult(result *scopes.CategorisedResult) bool {
+    fmt.Print("PUSHING RESULT\n")
+    result.SetCategory(l.category)
+    fmt.Print(result.URI())
+    fmt.Print("\n")
+    // we just filter one of the results to verify
+    // this method is taken into account when pushing results
+    return result.Title() != "TEST"
+}
+
+func (s *MyScope) Preview(result *scopes.Result, metadata *scopes.ActionMetadata, reply *scopes.PreviewReply, cancelled <-chan bool) error {
+    return nil
+}
+
+func (s *MyScope) Search(query *scopes.CannedQuery, metadata *scopes.SearchMetadata, reply *scopes.SearchReply, cancelled <-chan bool) error {
+    // THIS IS JUST A TEST ON THE STDOUT
+    childScopes := s.base.ChildScopes()
+    fmt.Print("CHILD SCOPES ****************************************************************\n")
+    for k := range childScopes {
+        fmt.Print(childScopes[k].Id())
+        fmt.Print("\n")
+        // create the cateogry for this child scope
+        cat := reply.RegisterCategory("cat_"+childScopes[k].Id(), fmt.Sprintf("Category %s", childScopes[k].Id()), "", searchCategoryTemplate)
+        // create a search listener
+        listener := NewTestScopeListener(childScopes[k].Id(), cat)
+        reply.Subsearch(childScopes[k], query.QueryString(), "", metadata, listener)
+    }
+    fmt.Print("CHILD SCOPES ****************************************************************\n")
+    fmt.Print("EXIT SEARCH -------------------------------------\n")
+    return nil
+}
+
+func (s *MyScope) FindChildScopes() []*scopes.ChildScope {
+    child_scopes := make([]*scopes.ChildScope, 0)
+
+    listScopes := s.base.ListRegistryScopes()
+    for _, item := range listScopes {
+        fmt.Print("Adding.... ")
+        fmt.Print(item.ScopeId)
+        fmt.Print("\n")
+        if item.ScopeId != "aggregated" {
+            fmt.Print("Done. \n")
+            child_scope := scopes.NewChildScope(item.ScopeId, item, true, []string{"music"})
+            child_scopes = append(child_scopes, child_scope)
+        }
+    }
+    return child_scopes
+}
+
+func (s *MyScope) SetScopeBase(base *scopes.ScopeBase) {
+    s.base = base
+
+    // THIS IS JUST A TEST ON THE STDOUT
+    listScopes := s.base.ListRegistryScopes()
+    fmt.Print("LIST SCOPES ****************************************************************\n")
+    for k := range listScopes {
+        fmt.Print(k)
+        fmt.Print("\n")
+        fmt.Print(*listScopes[k])
+        fmt.Print("\n")
+    }
+    fmt.Print("LIST SCOPES ****************************************************************\n")
+}
+
+func (s *MyScope) GetScopeBase() *scopes.ScopeBase {
+    return s.base
+}
+
+// MAIN ************************************************************************
+
+func main() {
+    var sc MyScope
+    scope_interface = &sc
+
+    if err := scopes.Run(&MyScope{}); err != nil {
+        log.Fatalln(err)
+    }
+}

=== added file 'tests/aggregated/aggregated.ini.in'
--- tests/aggregated/aggregated.ini.in	1970-01-01 00:00:00 +0000
+++ tests/aggregated/aggregated.ini.in	2015-06-17 07:29:19 +0000
@@ -0,0 +1,16 @@
+[ScopeConfig]
+ScopeRunner=$GOPATH$/bin/aggregated --runtime %R --scope %S
+DisplayName = mock.DisplayName
+Description = mock.Description
+Author = test
+Art = mock.Art
+Icon = /mock.Icon
+SearchHint = mock.SearchHint
+HotKey = mock.HotKey
+IsAggregator=false
+
+[Appearance]
+PageHeader.Logo = http://assets.ubuntu.com/sites/ubuntu/1110/u/img/logos/logo-ubuntu-orange.svg
+PageHeader.ForegroundColor = white
+PageHeader.Background = color://black
+ShapeImages = false
\ No newline at end of file

=== added file 'tests/aggregated/aggregated_test.py'
--- tests/aggregated/aggregated_test.py	1970-01-01 00:00:00 +0000
+++ tests/aggregated/aggregated_test.py	2015-06-17 07:29:19 +0000
@@ -0,0 +1,269 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2015 Canonical Ltd.
+# Author: Xavi Garcia <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+This is a test of an aggregated go-bindings scope.
+"""
+
+from scope_harness import ( ScopeHarness, CategoryMatcher, CategoryMatcherMode, CategoryListMatcher,
+                            CategoryListMatcherMode, ResultMatcher, PreviewMatcher, PreviewWidgetMatcher,
+                            PreviewColumnMatcher, PreviewView,
+                            Parameters, DepartmentMatcher, ChildDepartmentMatcher )
+from scope_harness.testing import ScopeHarnessTestCase
+import unittest
+import sys
+import os
+from shutil import copyfile
+import inspect
+
+TEST_DATA_DIR = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
+SCOPE_NAME = "aggregated"
+CONFIG_FILE = "aggregated.ini"
+
+CHILD_SCOPE_NAME_1 = "simple-scope"
+CHILD_SCOPE_NAME_2 = "simple-scope-2"
+CHILD_SCOPE_CONFIG_FILE = "simple-scope.ini"
+CHILD_SCOPE_CONFIG_FILE_2 = "simple-scope-2.ini"
+
+def remove_ini_file(config_file):
+    os.remove(TEST_DATA_DIR + "/" + config_file)
+
+def copy_binary(scope_name):
+    binary = os.environ.get('GOPATH') + "/bin/" + scope_name
+    if not os.path.exists(binary):
+        raise Exception("The binary %s does not exist." % binary)
+    copyfile(binary, TEST_DATA_DIR + "/" + scope_name)
+
+def remove_binary(scope_name):
+    os.remove(TEST_DATA_DIR + "/" + scope_name)
+
+def prepare_ini_file(config_file):
+    copy_and_set_go_path(TEST_DATA_DIR + "/" + config_file + ".in", TEST_DATA_DIR + "/" + config_file)
+
+def copy_and_set_go_path(infile, outfile):
+    with open(outfile, "wt") as fout:
+        with open(infile, "rt") as fin:
+            for line in fin:
+                fout.write(line.replace("$GOPATH$", os.environ.get('GOPATH')))
+
+class ResultsTest(ScopeHarnessTestCase):
+    @classmethod
+    def setUpClass(cls):
+        copy_binary(SCOPE_NAME)
+        copy_binary(CHILD_SCOPE_NAME_1)
+        copy_binary(CHILD_SCOPE_NAME_2)
+
+        prepare_ini_file(CONFIG_FILE)
+        prepare_ini_file(CHILD_SCOPE_CONFIG_FILE)
+        prepare_ini_file(CHILD_SCOPE_CONFIG_FILE_2)
+        cls.harness = ScopeHarness.new_from_scope_list(Parameters([
+            TEST_DATA_DIR + "/" + CONFIG_FILE,
+            TEST_DATA_DIR + "/" + CHILD_SCOPE_CONFIG_FILE,
+            TEST_DATA_DIR + "/" + CHILD_SCOPE_CONFIG_FILE_2
+            ]))
+        cls.view = cls.harness.results_view
+        cls.view.active_scope = SCOPE_NAME
+        cls.view.search_query = ""
+
+    @classmethod
+    def tearDownClass(cls):
+        remove_ini_file(CONFIG_FILE)
+        remove_ini_file(CHILD_SCOPE_CONFIG_FILE)
+        remove_ini_file(CHILD_SCOPE_CONFIG_FILE_2)
+
+        remove_binary(SCOPE_NAME)
+        remove_binary(CHILD_SCOPE_NAME_1)
+        remove_binary(CHILD_SCOPE_NAME_2)
+
+    def test_basic_result(self):
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .title("Category simple-scope")
+                    .icon("")
+                    )
+            .match(self.view.categories)
+            )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope-2")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .title("Category simple-scope-2")
+                    .icon("")
+                    )
+            .match(self.view.categories)
+            )
+
+    def test_scope_properties(self):
+        self.assertEqual(self.view.scope_id, SCOPE_NAME)
+        self.assertEqual(self.view.display_name, 'mock.DisplayName')
+        self.assertEqual(self.view.icon_hint, '/mock.Icon')
+        self.assertEqual(self.view.description, 'mock.Description')
+        self.assertEqual(self.view.search_hint, 'mock.SearchHint')
+        self.assertEqual(self.view.shortcut, 'mock.HotKey')
+
+        customizations = self.view.customizations
+        self.assertTrue(len(customizations)!=0)
+
+        header_customizations = customizations["page-header"]
+        self.assertEqual(header_customizations["logo"], "http://assets.ubuntu.com/sites/ubuntu/1110/u/img/logos/logo-ubuntu-orange.svg")
+        self.assertEqual(header_customizations["background"], "color://black")
+        self.assertEqual(header_customizations["foreground-color"], "white")
+        self.assertEqual(customizations["shape-images"], False)
+
+    def test_result_data(self):
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://localhost2/")
+                    .properties({'test_value_bool': False})
+                    .properties({'test_value_string': "test_value2"})
+                    .properties({'test_value_int': 2000})
+                    .properties({'test_value_float': 2.1})
+                    .dnd_uri("http://localhost_dnduri2")
+                    .properties({'test_value_map': {'value1':1,'value2':'string_value'}})
+                    .properties({'test_value_array': [1999,"string_value"]})
+                    .art("https://pbs.twimg.com/profile_images/1117820653/5ttls5.jpg.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope-2")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://TEST-FROM-SCOPE-2_1/")
+                    .properties({'test_value_bool': True})
+                    .properties({'test_value_string': "test_value"})
+                    .properties({'test_value_int': 1999})
+                    .properties({'test_value_float': 1.999})
+                    .dnd_uri("http://localhost_dnduri")
+                    .art("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope-2")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://TEST-FROM-SCOPE-2_2/")
+                    .properties({'test_value_bool': False})
+                    .properties({'test_value_string': "test_value2"})
+                    .properties({'test_value_int': 2000})
+                    .properties({'test_value_float': 2.1})
+                    .dnd_uri("http://localhost_dnduri2")
+                    .properties({'test_value_map': {'value1':1,'value2':'string_value'}})
+                    .properties({'test_value_array': [1999,"string_value"]})
+                    .art("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+    def test_result_data_query(self):
+        self.view.active_scope = SCOPE_NAME
+        test_query = "test_query"
+        self.view.search_query = test_query
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://localhost/" + test_query)
+                    .properties({'test_value_bool': True})
+                    .properties({'test_value_string': "test_value" + test_query})
+                    .properties({'test_value_int': 1999})
+                    .properties({'test_value_float': 1.999})
+                    .dnd_uri("http://localhost_dnduri" + test_query)
+                    .art("https://pbs.twimg.com/profile_images/1117820653/5ttls5.jpg.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://localhost2/" + test_query)
+                    .properties({'test_value_bool': False})
+                    .properties({'test_value_string': "test_value2" + test_query})
+                    .properties({'test_value_int': 2000})
+                    .properties({'test_value_float': 2.1})
+                    .dnd_uri("http://localhost_dnduri2" + test_query)
+                    .properties({'test_value_map': {'value1':1,'value2':'string_value'}})
+                    .properties({'test_value_array': [1999,"string_value"]})
+                    .art("https://pbs.twimg.com/profile_images/1117820653/5ttls5.jpg.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope-2")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://TEST-FROM-SCOPE-2_1/" + test_query)
+                    .properties({'test_value_bool': True})
+                    .properties({'test_value_string': "test_value" + test_query})
+                    .properties({'test_value_int': 1999})
+                    .properties({'test_value_float': 1.999})
+                    .dnd_uri("http://localhost_dnduri" + test_query)
+                    .art("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+        self.assertMatchResult(CategoryListMatcher()
+            .has_at_least(1)
+            .mode(CategoryListMatcherMode.BY_ID)
+            .category(CategoryMatcher("cat_simple-scope-2")
+                    .has_at_least(1)
+                    .mode(CategoryMatcherMode.BY_URI)
+                    .result(ResultMatcher("http://TEST-FROM-SCOPE-2_2/" + test_query)
+                    .properties({'test_value_bool': False})
+                    .properties({'test_value_string': "test_value2" + test_query})
+                    .properties({'test_value_int': 2000})
+                    .properties({'test_value_float': 2.1})
+                    .dnd_uri("http://localhost_dnduri2" + test_query)
+                    .properties({'test_value_map': {'value1':1,'value2':'string_value'}})
+                    .properties({'test_value_array': [1999,"string_value"]})
+                    .art("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+                    ))
+            .match(self.view.categories)
+        )
+
+if __name__ == '__main__':
+    unittest.main(argv = sys.argv[:1])

=== added file 'tests/aggregated/simple-scope-2.ini.in'
--- tests/aggregated/simple-scope-2.ini.in	1970-01-01 00:00:00 +0000
+++ tests/aggregated/simple-scope-2.ini.in	2015-06-17 07:29:19 +0000
@@ -0,0 +1,16 @@
+[ScopeConfig]
+ScopeRunner=$GOPATH$/bin/simple-scope-2 --runtime %R --scope %S
+DisplayName = mock.DisplayName
+Description = mock.Description
+Author = test
+Art = mock.Art
+Icon = /mock.Icon
+SearchHint = mock.SearchHint
+HotKey = mock.HotKey
+IsAggregator=false
+
+[Appearance]
+PageHeader.Logo = http://assets.ubuntu.com/sites/ubuntu/1110/u/img/logos/logo-ubuntu-orange.svg
+PageHeader.ForegroundColor = white
+PageHeader.Background = color://black
+ShapeImages = false

=== added file 'tests/aggregated/simple-scope.ini.in'
--- tests/aggregated/simple-scope.ini.in	1970-01-01 00:00:00 +0000
+++ tests/aggregated/simple-scope.ini.in	2015-06-17 07:29:19 +0000
@@ -0,0 +1,16 @@
+[ScopeConfig]
+ScopeRunner=$GOPATH$/bin/simple-scope --runtime %R --scope %S
+DisplayName = mock.DisplayName
+Description = mock.Description
+Author = test
+Art = mock.Art
+Icon = /mock.Icon
+SearchHint = mock.SearchHint
+HotKey = mock.HotKey
+IsAggregator=false
+
+[Appearance]
+PageHeader.Logo = http://assets.ubuntu.com/sites/ubuntu/1110/u/img/logos/logo-ubuntu-orange.svg
+PageHeader.ForegroundColor = white
+PageHeader.Background = color://black
+ShapeImages = false

=== modified file 'tests/goscope/goscope.go'
--- tests/goscope/goscope.go	2015-06-17 07:29:19 +0000
+++ tests/goscope/goscope.go	2015-06-17 07:29:19 +0000
@@ -3,7 +3,6 @@
 import (
 	"launchpad.net/go-unityscopes/v2"
 	"log"
-	"fmt"
 )
 
 const searchCategoryTemplate = `{
@@ -21,7 +20,7 @@
 
 // SCOPE ***********************************************************************
 
-var scope_interface scopes.AggregatedScope
+var scope_interface scopes.Scope
 
 type MyScope struct {
 	base *scopes.ScopeBase
@@ -102,15 +101,7 @@
 	var filterState scopes.FilterState
 	// for RTM version of libunity-scopes we should see a log message
 	reply.PushFilters([]scopes.Filter{filter1}, filterState)
-	
-	// THIS IS JUST A TEST ON THE STDOUT
-	childScopes := s.base.ChildScopes()
-	fmt.Print("CHILD SCOPES ****************************************************************\n")
-	for k := range childScopes {
-		fmt.Print(childScopes[k].Id())
-		fmt.Print("\n")
-	}
-	fmt.Print("CHILD SCOPES ****************************************************************\n")
+
 	return s.AddQueryResults(reply, query.QueryString())
 }
 
@@ -127,17 +118,6 @@
 
 func (s *MyScope) SetScopeBase(base *scopes.ScopeBase) {
 	s.base = base
-	
-	// THIS IS JUST A TEST ON THE STDOUT
-	listScopes := s.base.ListRegistryScopes()
-	fmt.Print("LIST SCOPES ****************************************************************\n")
-	for k := range listScopes {
-		fmt.Print(k)
-		fmt.Print("\n")
-		fmt.Print(*listScopes[k])
-		fmt.Print("\n")
-	}
-	fmt.Print("LIST SCOPES ****************************************************************\n")
 }
 
 // RESULTS *********************************************************************

=== added directory 'tests/simple-scope'
=== added directory 'tests/simple-scope-2'
=== added file 'tests/simple-scope-2/simple-scope-2.go'
--- tests/simple-scope-2/simple-scope-2.go	1970-01-01 00:00:00 +0000
+++ tests/simple-scope-2/simple-scope-2.go	2015-06-17 07:29:19 +0000
@@ -0,0 +1,157 @@
+package main
+
+import (
+	"launchpad.net/go-unityscopes/v2"
+	"log"
+)
+
+const searchCategoryTemplate = `{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art":  "art",
+    "subtitle": "username"
+  }
+}`
+
+// SCOPE ***********************************************************************
+
+var scope_interface scopes.Scope
+
+type MyScope struct {
+	base *scopes.ScopeBase
+}
+
+func (s *MyScope) Preview(result *scopes.Result, metadata *scopes.ActionMetadata, reply *scopes.PreviewReply, cancelled <-chan bool) error {
+	layout1col := scopes.NewColumnLayout(1)
+	layout2col := scopes.NewColumnLayout(2)
+	layout3col := scopes.NewColumnLayout(3)
+
+	// Single column layout
+	layout1col.AddColumn("image", "header", "summary", "actions")
+
+	// Two column layout
+	layout2col.AddColumn("image")
+	layout2col.AddColumn("header", "summary", "actions")
+
+	// Three cokumn layout
+	layout3col.AddColumn("image")
+	layout3col.AddColumn("header", "summary", "actions")
+	layout3col.AddColumn()
+
+	// Register the layouts we just created
+	reply.RegisterLayout(layout1col, layout2col, layout3col)
+
+	header := scopes.NewPreviewWidget("header", "header")
+
+	// It has title and a subtitle properties
+	header.AddAttributeMapping("title", "title")
+	header.AddAttributeMapping("subtitle", "subtitle")
+
+	// Define the image section
+	image := scopes.NewPreviewWidget("image", "image")
+	// It has a single source property, mapped to the result's art property
+	image.AddAttributeMapping("source", "art")
+
+	// Define the summary section
+	description := scopes.NewPreviewWidget("summary", "text")
+	// It has a text property, mapped to the result's description property
+	description.AddAttributeMapping("text", "description")
+
+	// build variant map.
+	tuple1 := make(map[string]interface{})
+	tuple1["id"] = "open"
+	tuple1["label"] = "Open"
+	tuple1["uri"] = "application:///tmp/non-existent.desktop"
+
+	tuple2 := make(map[string]interface{})
+	tuple1["id"] = "download"
+	tuple1["label"] = "Download"
+
+	tuple3 := make(map[string]interface{})
+	tuple1["id"] = "hide"
+	tuple1["label"] = "Hide"
+
+	actions := scopes.NewPreviewWidget("actions", "actions")
+	actions.AddAttributeValue("actions", []interface{}{tuple1, tuple2, tuple3})
+
+	var scope_data string
+	metadata.ScopeData(scope_data)
+	if len(scope_data) > 0 {
+		extra := scopes.NewPreviewWidget("extra", "text")
+		extra.AddAttributeValue("text", "test Text")
+		reply.PushWidgets(header, image, description, actions, extra)
+	} else {
+		reply.PushWidgets(header, image, description, actions)
+	}
+
+	return nil
+}
+
+func (s *MyScope) Search(query *scopes.CannedQuery, metadata *scopes.SearchMetadata, reply *scopes.SearchReply, cancelled <-chan bool) error {
+	return s.AddQueryResults(reply, query.QueryString())
+}
+
+func (s *MyScope) SetScopeBase(base *scopes.ScopeBase) {
+	s.base = base
+}
+
+// RESULTS *********************************************************************
+
+func (s *MyScope) AddQueryResults(reply *scopes.SearchReply, query string) error {
+	cat := reply.RegisterCategory("category", "Category", "", searchCategoryTemplate)
+
+	result := scopes.NewCategorisedResult(cat)
+	result.SetURI("http://TEST-FROM-SCOPE-2_1/" + query)
+	result.SetDndURI("http://localhost_dnduri" + query)
+	result.SetTitle("TEST-FROM-SCOPE-2_1" + query)
+	result.SetArt("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+	result.Set("test_value_bool", true)
+	result.Set("test_value_string", "test_value"+query)
+	result.Set("test_value_int", 1999)
+	result.Set("test_value_float", 1.999)
+	if err := reply.Push(result); err != nil {
+		return err
+	}
+
+	result.SetURI("http://TEST-FROM-SCOPE-2_2/" + query)
+	result.SetDndURI("http://localhost_dnduri2" + query)
+	result.SetTitle("TEST-FROM-SCOPE-2_1")
+	result.SetArt("https://help.ubuntu.com/stable/ubuntu-help/figures/ubuntu-logo.png")
+	result.Set("test_value_bool", false)
+	result.Set("test_value_string", "test_value2"+query)
+	result.Set("test_value_int", 2000)
+	result.Set("test_value_float", 2.100)
+
+	// add a variant map value
+	m := make(map[string]interface{})
+	m["value1"] = 1
+	m["value2"] = "string_value"
+	result.Set("test_value_map", m)
+
+	// add a variant array value
+	l := make([]interface{}, 0)
+	l = append(l, 1999)
+	l = append(l, "string_value")
+	result.Set("test_value_array", l)
+	if err := reply.Push(result); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// MAIN ************************************************************************
+
+func main() {
+	var sc MyScope
+	scope_interface = &sc
+
+	if err := scopes.Run(&MyScope{}); err != nil {
+		log.Fatalln(err)
+	}
+}

=== added file 'tests/simple-scope/simple-scope.go'
--- tests/simple-scope/simple-scope.go	1970-01-01 00:00:00 +0000
+++ tests/simple-scope/simple-scope.go	2015-06-17 07:29:19 +0000
@@ -0,0 +1,157 @@
+package main
+
+import (
+	"launchpad.net/go-unityscopes/v2"
+	"log"
+)
+
+const searchCategoryTemplate = `{
+  "schema-version": 1,
+  "template": {
+    "category-layout": "grid",
+    "card-size": "small"
+  },
+  "components": {
+    "title": "title",
+    "art":  "art",
+    "subtitle": "username"
+  }
+}`
+
+// SCOPE ***********************************************************************
+
+var scope_interface scopes.Scope
+
+type MyScope struct {
+	base *scopes.ScopeBase
+}
+
+func (s *MyScope) Preview(result *scopes.Result, metadata *scopes.ActionMetadata, reply *scopes.PreviewReply, cancelled <-chan bool) error {
+	layout1col := scopes.NewColumnLayout(1)
+	layout2col := scopes.NewColumnLayout(2)
+	layout3col := scopes.NewColumnLayout(3)
+
+	// Single column layout
+	layout1col.AddColumn("image", "header", "summary", "actions")
+
+	// Two column layout
+	layout2col.AddColumn("image")
+	layout2col.AddColumn("header", "summary", "actions")
+
+	// Three cokumn layout
+	layout3col.AddColumn("image")
+	layout3col.AddColumn("header", "summary", "actions")
+	layout3col.AddColumn()
+
+	// Register the layouts we just created
+	reply.RegisterLayout(layout1col, layout2col, layout3col)
+
+	header := scopes.NewPreviewWidget("header", "header")
+
+	// It has title and a subtitle properties
+	header.AddAttributeMapping("title", "title")
+	header.AddAttributeMapping("subtitle", "subtitle")
+
+	// Define the image section
+	image := scopes.NewPreviewWidget("image", "image")
+	// It has a single source property, mapped to the result's art property
+	image.AddAttributeMapping("source", "art")
+
+	// Define the summary section
+	description := scopes.NewPreviewWidget("summary", "text")
+	// It has a text property, mapped to the result's description property
+	description.AddAttributeMapping("text", "description")
+
+	// build variant map.
+	tuple1 := make(map[string]interface{})
+	tuple1["id"] = "open"
+	tuple1["label"] = "Open"
+	tuple1["uri"] = "application:///tmp/non-existent.desktop"
+
+	tuple2 := make(map[string]interface{})
+	tuple1["id"] = "download"
+	tuple1["label"] = "Download"
+
+	tuple3 := make(map[string]interface{})
+	tuple1["id"] = "hide"
+	tuple1["label"] = "Hide"
+
+	actions := scopes.NewPreviewWidget("actions", "actions")
+	actions.AddAttributeValue("actions", []interface{}{tuple1, tuple2, tuple3})
+
+	var scope_data string
+	metadata.ScopeData(scope_data)
+	if len(scope_data) > 0 {
+		extra := scopes.NewPreviewWidget("extra", "text")
+		extra.AddAttributeValue("text", "test Text")
+		reply.PushWidgets(header, image, description, actions, extra)
+	} else {
+		reply.PushWidgets(header, image, description, actions)
+	}
+
+	return nil
+}
+
+func (s *MyScope) Search(query *scopes.CannedQuery, metadata *scopes.SearchMetadata, reply *scopes.SearchReply, cancelled <-chan bool) error {
+	return s.AddQueryResults(reply, query.QueryString())
+}
+
+func (s *MyScope) SetScopeBase(base *scopes.ScopeBase) {
+	s.base = base
+}
+
+// RESULTS *********************************************************************
+
+func (s *MyScope) AddQueryResults(reply *scopes.SearchReply, query string) error {
+	cat := reply.RegisterCategory("category", "Category", "", searchCategoryTemplate)
+
+	result := scopes.NewCategorisedResult(cat)
+	result.SetURI("http://localhost/" + query)
+	result.SetDndURI("http://localhost_dnduri" + query)
+	result.SetTitle("TEST" + query)
+	result.SetArt("https://pbs.twimg.com/profile_images/1117820653/5ttls5.jpg.png")
+	result.Set("test_value_bool", true)
+	result.Set("test_value_string", "test_value"+query)
+	result.Set("test_value_int", 1999)
+	result.Set("test_value_float", 1.999)
+	if err := reply.Push(result); err != nil {
+		return err
+	}
+
+	result.SetURI("http://localhost2/" + query)
+	result.SetDndURI("http://localhost_dnduri2" + query)
+	result.SetTitle("TEST2")
+	result.SetArt("https://pbs.twimg.com/profile_images/1117820653/5ttls5.jpg.png")
+	result.Set("test_value_bool", false)
+	result.Set("test_value_string", "test_value2"+query)
+	result.Set("test_value_int", 2000)
+	result.Set("test_value_float", 2.100)
+
+	// add a variant map value
+	m := make(map[string]interface{})
+	m["value1"] = 1
+	m["value2"] = "string_value"
+	result.Set("test_value_map", m)
+
+	// add a variant array value
+	l := make([]interface{}, 0)
+	l = append(l, 1999)
+	l = append(l, "string_value")
+	result.Set("test_value_array", l)
+	if err := reply.Push(result); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// MAIN ************************************************************************
+
+func main() {
+	var sc MyScope
+	scope_interface = &sc
+
+	if err := scopes.Run(&MyScope{}); err != nil {
+		log.Fatalln(err)
+	}
+}

=== modified file 'unityscope.go'
--- unityscope.go	2015-06-17 07:29:19 +0000
+++ unityscope.go	2015-06-17 07:29:19 +0000
@@ -41,9 +41,19 @@
 	Preview(result *Result, metadata *ActionMetadata, reply *PreviewReply, cancelled <-chan bool) error
 }
 
+// AggregatedScope defines the interface that scopes should implement to
+// aggregate sub scopes.
 type AggregatedScope interface {
 	Scope
 	FindChildScopes() []*ChildScope
+	GetScopeBase() *ScopeBase
+}
+
+// SearchListener is an interface that should be implemented for aggregated
+// scopes to retrieve results from their child scopes.
+type SearchListener interface {
+	FilterResult(result *CategorisedResult) bool
+	Finished()
 }
 
 // Activator is an interface that should be implemented by scopes that
@@ -61,10 +71,10 @@
 }
 
 //export callScopeSearch
-func callScopeSearch(scope Scope, queryPtr, metadataPtr unsafe.Pointer, replyData *C.uintptr_t, cancel <-chan bool) {
+func callScopeSearch(scope Scope, queryPtr, metadataPtr unsafe.Pointer, replyData *C.uintptr_t, queryBase *C._SearchQueryBase, cancel <-chan bool) {
 	query := makeCannedQuery((*C._CannedQuery)(queryPtr))
 	metadata := makeSearchMetadata((*C._SearchMetadata)(metadataPtr))
-	reply := makeSearchReply(replyData)
+	reply := makeSearchReply(replyData, queryBase)
 
 	go func() {
 		err := scope.Search(query, metadata, reply, cancel)
@@ -72,6 +82,12 @@
 			reply.Error(err)
 			return
 		}
+		switch scope.(type) {
+		case AggregatedScope:
+			reply.waitForChildScopesFinished()
+		default:
+			// nothing
+		}
 		reply.Finished()
 	}()
 }
@@ -212,7 +228,7 @@
 	var nb_scopes C.int
 	var c_array **C._ChildScope = C.list_child_scopes(b.b, &nb_scopes)
 	defer C.free(unsafe.Pointer(c_array))
-	
+
 	length := int(nb_scopes)
 	// create a very big slice and then slice it to the number of scopes metadata
 	slice := (*[1 << 27]*C._ChildScope)(unsafe.Pointer(c_array))[:length:length]