Merge lp:~dobey/unity-scope-click/multiline-attrs into lp:unity-scope-click/devel

[dobey]

Split the price and rating attributes into separate lines when surfacing results.

This changes the attributes being sent, so that we can display price and rating on separate lines when surfacing results, but keep price and rating on the same line when using the horizontal layout for active search results.

This requires the changes in https://code.launchpad.net/~saviq/unity-scopes-shell/no-mangle-attributes/+merge/232458 to be shown properly. Without that change, the price and rating will still be on the same line in the display, as they currently are.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/264
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/264/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/264

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/290/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/multiline-attrs]

428. By dobey on 2014-08-28

Link the bug report.

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:428
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/291/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/265
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/265/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/265

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/291/rebuild

review: Approve (continuous-integration)

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-22 20:29:13 +0000
+++ scope/clickstore/store-query.cpp	2014-08-28 14:08:32 +0000
@@ -73,7 +73,7 @@
         "components" : {
             "title" : "title",
             "subtitle": "subtitle",
-            "attributes": "attributes",
+            "attributes": { "field": "attributes", "max-count": 4 },
             "art" : {
                 "field": "art",
                 "aspect-ratio": 1.13
@@ -93,7 +93,7 @@
         "components" : {
             "title" : "title",
             "subtitle": "subtitle",
-            "attributes": "attributes",
+            "attributes": { "field": "attributes", "max-count": 4 },
             "art" : {
                 "field": "art",
                 "aspect-ratio": 0.55
@@ -112,7 +112,7 @@
     "components": {
         "title": "title",
         "subtitle": "subtitle",
-        "attributes": "attributes",
+        "attributes": { "field": "attributes", "max-count": 4 },
         "art": {
             "aspect-ratio": 2.5,
             "field": "art"
@@ -136,7 +136,7 @@
                 "aspect-ratio": 1.13
             },
             "subtitle": "subtitle",
-            "attributes": "attributes"
+            "attributes": { "field": "attributes", "max-count": 3 }
         }
     }
 )";
@@ -348,8 +348,14 @@
                 {"value", scopes::Variant(price)},
             });
         builder.add_tuple({
+                {"value", scopes::Variant("")},
+            });
+        builder.add_tuple({
                 {"value", scopes::Variant(rating)},
             });
+        builder.add_tuple({
+                {"value", scopes::Variant("")},
+            });
         res["attributes"] = builder.end();
 
         this->push_result(searchReply, res);