← Back to branch summary

~unity-api-team/unity-scopes-api/child-scopes-option

« back to all changes in this revision

Viewing changes to src/scopes/internal/smartscopes/SmartScope.cpp

  • Committer: Marcus Tomlinson
  • Date: 2014-10-08 10:58:57 UTC
  • mfrom: (497.1.3 devel)
  • mto: (497.1.5 devel)
  • mto: This revision was merged to the branch mainline in revision 505.
  • Revision ID: marcus.tomlinson@canonical.com-20141008105857-gf4ilb9ywfeaeroi
Merged devel

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scopes/internal/smartscopes/SmartScope.cpp
163
163
    ///! TODO: country (+location data)
164
164
    int query_id = 0;
165
165
    std::string session_id;
 
166
    std::string agent;
166
167
    auto const metadata = search_metadata();
167
168
    if (metadata.contains_hint("session-id") && metadata["session-id"].which() == Variant::String)
168
169
    {
181
182
    {
182
183
        std::cout << "SmartScope: missing or invalid query id for \"" << scope_id_ << "\": \"" << query_.query_string() << "\"" << std::endl;
183
184
    }
 
185
    if (metadata.contains_hint("user-agent") && metadata["user-agent"].which() == Variant::String)
 
186
    {
 
187
        agent = metadata["user-agent"].get_string();
 
188
    }
184
189
 
185
 
    search_handle_ = ss_client_->search(handler, base_url_, query_.query_string(), query_.department_id(), session_id, query_id, hints_.form_factor(), settings(), query_.filter_state().serialize(), hints_.locale(), "", hints_.cardinality());
 
190
    search_handle_ = ss_client_->search(handler, base_url_, query_.query_string(), query_.department_id(), session_id, query_id, hints_.form_factor(),
 
191
            settings(), query_.filter_state().serialize(), hints_.locale(), "", agent, hints_.cardinality());
186
192
    search_handle_->wait();
187
193
 
188
194
    std::cout << "SmartScope: query for \"" << scope_id_ << "\": \"" << query_.query_string() << "\" complete" << std::endl;
250
256
        }
251
257
    };
252
258
 
253
 
    ///! TODO: widgets_api_version, country (+location data)
 
259
    ///! TODO: country (+location data)
254
260
    std::string session_id;
 
261
    std::string agent;
255
262
    auto const metadata = action_metadata();
256
263
    if (metadata.contains_hint("session-id") && metadata["session-id"].which() == Variant::String)
257
264
    {
263
270
        std::cout << "SmartScope: missing or invalid session id for \"" << scope_id_ << "\" preview: \"" << result().uri() << "\"" << std::endl;
264
271
    }
265
272
 
266
 
    preview_handle_ = ss_client_->preview(handler, base_url_, result_["result_json"].get_string(), session_id, hints_.form_factor(), 0, settings(), hints_.locale(), "");
 
273
    if (metadata.contains_hint("user-agent") && metadata["user-agent"].which() == Variant::String)
 
274
    {
 
275
        agent = metadata["user-agent"].get_string();
 
276
    }
 
277
 
 
278
    preview_handle_ = ss_client_->preview(handler, base_url_, result_["result_json"].get_string(), session_id, hints_.form_factor(), 0, settings(),
 
279
            hints_.locale(), "", agent);
267
280
 
268
281
    preview_handle_->wait();
269
282