comparison OrthancServer/Sources/ServerContext.cpp @ 5581:4ad301c35f6e find-refactoring

refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 27 Apr 2024 15:02:24 +0200
parents 77570cce8855
children 74cc31c8db2b
comparison
equal deleted inserted replaced
5580:df7324d6e728 5581:4ad301c35f6e
2716 2716
2717 return elapsed.total_seconds(); 2717 return elapsed.total_seconds();
2718 } 2718 }
2719 2719
2720 void ServerContext::AppendFindResponse(Json::Value& target, 2720 void ServerContext::AppendFindResponse(Json::Value& target,
2721 ResourceType level, 2721 const FindRequest& request,
2722 const FindResponse::Item& item, 2722 const FindResponse::Item& item,
2723 DicomToJsonFormat format, 2723 DicomToJsonFormat format,
2724 const std::set<DicomTag>& requestedTags, 2724 const std::set<DicomTag>& requestedTags,
2725 bool allowStorageAccess) 2725 bool allowStorageAccess)
2726 { 2726 {
2727 // convert to ExpandedResource to re-use the serialization code TODO-FIND: check if this is the right way to do. shouldn't we copy the code and finally get rid of ExpandedResource ? 2727 // convert to ExpandedResource to re-use the serialization code TODO-FIND: check if this is the right way to do. shouldn't we copy the code and finally get rid of ExpandedResource ?
2728 ExpandedResource resource(level, item); 2728 ExpandedResource resource(request.GetLevel(), item);
2729 2729
2730 ExpandResourceFlags expandFlags = ExpandResourceFlags_None; 2730 ExpandResourceFlags expandFlags = ExpandResourceFlags_None;
2731 if (item.HasResponseContent(FindRequest::ResponseContent_Children)) 2731 if (item.HasResponseContent(FindRequest::ResponseContent_Children))
2732 { 2732 {
2733 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeChildren); 2733 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeChildren);