Skip to content

Commit

Permalink
Update per AMWA-TV/is-13#21
Browse files Browse the repository at this point in the history
  • Loading branch information
garethsb committed May 23, 2023
1 parent 674bb36 commit c92ceb1
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 17 deletions.
29 changes: 22 additions & 7 deletions Development/nmos/annotation_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,28 @@ namespace nmos

size_t count = 0;

set_reply(res, status_codes::OK,
web::json::serialize_array(resources
| boost::adaptors::filtered(match)
| boost::adaptors::transformed(
[&count](const nmos::resources::value_type& resource) { ++count; return nmos::make_annotation_response(resource); }
)),
web::http::details::mime_types::application_json);
// experimental extension, to support human-readable HTML rendering of NMOS responses
if (experimental::details::is_html_response_preferred(req, web::http::details::mime_types::application_json))
{
set_reply(res, status_codes::OK,
web::json::serialize_array(resources
| boost::adaptors::filtered(match)
| boost::adaptors::transformed(
[&count, &req](const nmos::resource& resource) { ++count; return experimental::details::make_html_response_a_tag(resource.id + U("/"), req); }
)),
web::http::details::mime_types::application_json);
}
else
{
set_reply(res, status_codes::OK,
web::json::serialize_array(resources
| boost::adaptors::filtered(match)
| boost::adaptors::transformed(
[&count](const nmos::resource& resource) { ++count; return value(resource.id + U("/")); }
)
),
web::http::details::mime_types::application_json);
}

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Returning " << count << " matching " << resourceType;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "http://json-schema.org/draft-04/schema",
"type": "array",
"description": "List of resource ID paths",
"title": "Resources base resource",
"items": {
"type": "string",
"pattern": "^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/$"
},
"uniqueItems": true
}

This file was deleted.

0 comments on commit c92ceb1

Please sign in to comment.