Mercurial > hg > orthanc
changeset 5836:618d44e0e714 find-refactoring
renamed QueryMetadata into MetadataQuery
author | Alain Mazy <am@orthanc.team> |
---|---|
date | Mon, 14 Oct 2024 16:00:55 +0200 |
parents | 7c61bdf925fc |
children | 82fc95cc168c |
files | NEWS OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp |
diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Mon Oct 14 15:47:51 2024 +0200 +++ b/NEWS Mon Oct 14 16:00:55 2024 +0200 @@ -38,7 +38,7 @@ - 'OrderBy' to order by DICOM Tag or metadata value - 'ParentPatient', 'ParentStudy', 'ParentSeries' to retrieve only descendants of an Orthanc resource. - - 'QueryMetadata' to filter results based on metadata values. + - 'MetadataQuery' to filter results based on metadata values. - 'ResponseContent' to define what shall be included in the response for each returned resource (e.g: Metadata, Children, ...)
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Mon Oct 14 15:47:51 2024 +0200 +++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp Mon Oct 14 16:00:55 2024 +0200 @@ -3263,7 +3263,7 @@ static const char* const KEY_PARENT_PATIENT = "ParentPatient"; // New in Orthanc 1.12.5 static const char* const KEY_PARENT_STUDY = "ParentStudy"; // New in Orthanc 1.12.5 static const char* const KEY_PARENT_SERIES = "ParentSeries"; // New in Orthanc 1.12.5 - static const char* const KEY_QUERY_METADATA = "QueryMetadata"; // New in Orthanc 1.12.5 + static const char* const KEY_METADATA_QUERY = "MetadataQuery"; // New in Orthanc 1.12.5 static const char* const KEY_RESPONSE_CONTENT = "ResponseContent"; // New in Orthanc 1.12.5 if (call.IsDocumentation()) @@ -3306,7 +3306,7 @@ "Limit the reported resources to descendants of this study (new in Orthanc 1.12.5)", true) .SetRequestField(KEY_PARENT_SERIES, RestApiCallDocumentation::Type_String, "Limit the reported resources to descendants of this series (new in Orthanc 1.12.5)", true) - .SetRequestField(KEY_QUERY_METADATA, RestApiCallDocumentation::Type_JsonObject, + .SetRequestField(KEY_METADATA_QUERY, RestApiCallDocumentation::Type_JsonObject, "Associative array containing the filter on the values of the metadata (new in Orthanc 1.12.5)", true) .SetRequestField(KEY_RESPONSE_CONTENT, RestApiCallDocumentation::Type_JsonListOfStrings, "Defines the content of response for each returned resource. Allowed values are `MainDicomTags`, " @@ -3386,11 +3386,11 @@ throw OrthancException(ErrorCode_BadRequest, "Field \"" + std::string(KEY_ORDER_BY) + "\" must be an array"); } - else if (request.isMember(KEY_QUERY_METADATA) && - request[KEY_QUERY_METADATA].type() != Json::objectValue) + else if (request.isMember(KEY_METADATA_QUERY) && + request[KEY_METADATA_QUERY].type() != Json::objectValue) { throw OrthancException(ErrorCode_BadRequest, - "Field \"" + std::string(KEY_QUERY_METADATA) + "\" must be an JSON object"); + "Field \"" + std::string(KEY_METADATA_QUERY) + "\" must be an JSON object"); } else if (request.isMember(KEY_PARENT_PATIENT) && request[KEY_PARENT_PATIENT].type() != Json::stringValue) @@ -3502,17 +3502,17 @@ } { // Metadata query - Json::Value::Members members = request[KEY_QUERY_METADATA].getMemberNames(); + Json::Value::Members members = request[KEY_METADATA_QUERY].getMemberNames(); for (size_t i = 0; i < members.size(); i++) { - if (request[KEY_QUERY_METADATA][members[i]].type() != Json::stringValue) + if (request[KEY_METADATA_QUERY][members[i]].type() != Json::stringValue) { throw OrthancException(ErrorCode_BadRequest, "Tag \"" + members[i] + "\" must be associated with a string"); } MetadataType metadata = StringToMetadata(members[i]); - const std::string value = request[KEY_QUERY_METADATA][members[i]].asString(); + const std::string value = request[KEY_METADATA_QUERY][members[i]].asString(); if (!value.empty()) {