Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp @ 5832:dd2af8692cbc find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new default ResponseContent
author Alain Mazy <am@orthanc.team>
date Wed, 09 Oct 2024 10:23:04 +0200
parents 963945d780d6
children 58c549b881ae 79a497908b04
comparison
equal deleted inserted replaced
5831:22623aa8e6fc 5832:dd2af8692cbc
135 ResourceType level, 135 ResourceType level,
136 const std::string& identifier, 136 const std::string& identifier,
137 DicomToJsonFormat format, 137 DicomToJsonFormat format,
138 bool retrieveMetadata) 138 bool retrieveMetadata)
139 { 139 {
140 ResponseContentFlags responseContent = ResponseContentFlags_Default; 140 ResponseContentFlags responseContent = ResponseContentFlags_ExpandTrue;
141 141
142 if (retrieveMetadata) 142 if (retrieveMetadata)
143 { 143 {
144 responseContent = static_cast<ResponseContentFlags>(static_cast<uint32_t>(responseContent) | ResponseContentFlags_Metadata); 144 responseContent = static_cast<ResponseContentFlags>(static_cast<uint32_t>(responseContent) | ResponseContentFlags_Metadata);
145 } 145 }
263 call.GetBooleanArgument("expand", true)); 263 call.GetBooleanArgument("expand", true));
264 264
265 std::set<DicomTag> requestedTags; 265 std::set<DicomTag> requestedTags;
266 OrthancRestApi::GetRequestedTags(requestedTags, call); 266 OrthancRestApi::GetRequestedTags(requestedTags, call);
267 267
268 ResourceFinder finder(resourceType, (expand ? ResponseContentFlags_Default : ResponseContentFlags_ID)); 268 ResourceFinder finder(resourceType, (expand ? ResponseContentFlags_ExpandTrue : ResponseContentFlags_ID));
269 finder.AddRequestedTags(requestedTags); 269 finder.AddRequestedTags(requestedTags);
270 270
271 if (call.HasArgument("limit") || 271 if (call.HasArgument("limit") ||
272 call.HasArgument("since")) 272 call.HasArgument("since"))
273 { 273 {
369 { 369 {
370 /** 370 /**
371 * EXPERIMENTAL VERSION 371 * EXPERIMENTAL VERSION
372 **/ 372 **/
373 373
374 ResourceFinder finder(resourceType, ResponseContentFlags_Default); 374 ResourceFinder finder(resourceType, ResponseContentFlags_ExpandTrue);
375 finder.AddRequestedTags(requestedTags); 375 finder.AddRequestedTags(requestedTags);
376 finder.SetOrthancId(resourceType, call.GetUriComponent("id", "")); 376 finder.SetOrthancId(resourceType, call.GetUriComponent("id", ""));
377 377
378 Json::Value json; 378 Json::Value json;
379 if (finder.ExecuteOneResource(json, OrthancRestApi::GetContext(call), format, false /* no "Metadata" field */)) 379 if (finder.ExecuteOneResource(json, OrthancRestApi::GetContext(call), format, false /* no "Metadata" field */))
3418 3418
3419 ResponseContentFlags responseContent = ResponseContentFlags_ID; 3419 ResponseContentFlags responseContent = ResponseContentFlags_ID;
3420 3420
3421 if (request.isMember(KEY_RESPONSE_CONTENT)) 3421 if (request.isMember(KEY_RESPONSE_CONTENT))
3422 { 3422 {
3423 responseContent = ResponseContentFlags_Default;
3424
3423 for (Json::ArrayIndex i = 0; i < request[KEY_RESPONSE_CONTENT].size(); ++i) 3425 for (Json::ArrayIndex i = 0; i < request[KEY_RESPONSE_CONTENT].size(); ++i)
3424 { 3426 {
3425 responseContent = static_cast<ResponseContentFlags>(static_cast<uint32_t>(responseContent) | StringToResponseContent(request[KEY_RESPONSE_CONTENT][i].asString())); 3427 responseContent = static_cast<ResponseContentFlags>(static_cast<uint32_t>(responseContent) | StringToResponseContent(request[KEY_RESPONSE_CONTENT][i].asString()));
3426 } 3428 }
3427 } 3429 }
3428 else if (request.isMember(KEY_EXPAND) && request[KEY_EXPAND].asBool()) 3430 else if (request.isMember(KEY_EXPAND) && request[KEY_EXPAND].asBool())
3429 { 3431 {
3430 responseContent = ResponseContentFlags_Default; 3432 responseContent = ResponseContentFlags_ExpandTrue;
3431 } 3433 }
3432 3434
3433 const ResourceType level = StringToResourceType(request[KEY_LEVEL].asCString()); 3435 const ResourceType level = StringToResourceType(request[KEY_LEVEL].asCString());
3434 3436
3435 ResourceFinder finder(level, responseContent); 3437 ResourceFinder finder(level, responseContent);
3820 { 3822 {
3821 /** 3823 /**
3822 * EXPERIMENTAL VERSION 3824 * EXPERIMENTAL VERSION
3823 **/ 3825 **/
3824 3826
3825 ResourceFinder finder(end, (expand ? ResponseContentFlags_Default : ResponseContentFlags_ID)); 3827 ResourceFinder finder(end, (expand ? ResponseContentFlags_ExpandTrue : ResponseContentFlags_ID));
3826 finder.SetOrthancId(start, call.GetUriComponent("id", "")); 3828 finder.SetOrthancId(start, call.GetUriComponent("id", ""));
3827 finder.AddRequestedTags(requestedTags); 3829 finder.AddRequestedTags(requestedTags);
3828 3830
3829 Json::Value answer; 3831 Json::Value answer;
3830 finder.Execute(answer, context, format, false /* no "Metadata" field */); 3832 finder.Execute(answer, context, format, false /* no "Metadata" field */);