Mercurial > hg > orthanc

comparison OrthancServer/Sources/ServerContext.cpp @ 5583:74cc31c8db2b find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed FindResponse::Item::responseContent_
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 27 Apr 2024 22:15:37 +0200
parents 4ad301c35f6e
children b51ee994cd6f
comparison
equal deleted inserted replaced
5582:17da828f9443 5583:74cc31c8db2b
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(request.GetLevel(), item); 2728 ExpandedResource resource(request, item);
2729 2729
2730 ExpandResourceFlags expandFlags = ExpandResourceFlags_None; 2730 ExpandResourceFlags expandFlags = ExpandResourceFlags_None;
2731 if (item.HasResponseContent(FindRequest::ResponseContent_Children)) 2731 if (request.HasResponseContent(FindRequest::ResponseContent_Children))
2732 { 2732 {
2733 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeChildren); 2733 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeChildren);
2734 } 2734 }
2735 if (item.HasResponseContent(FindRequest::ResponseContent_Metadata)) 2735 if (request.HasResponseContent(FindRequest::ResponseContent_Metadata))
2736 { 2736 {
2737 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeAllMetadata | ExpandResourceFlags_IncludeMetadata ); 2737 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeAllMetadata | ExpandResourceFlags_IncludeMetadata );
2738 } 2738 }
2739 if (item.HasResponseContent(FindRequest::ResponseContent_MainDicomTags)) 2739 if (request.HasResponseContent(FindRequest::ResponseContent_MainDicomTags))
2740 { 2740 {
2741 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeMainDicomTags); 2741 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeMainDicomTags);
2742 } 2742 }
2743 if (item.HasResponseContent(FindRequest::ResponseContent_IsStable)) 2743 if (request.HasResponseContent(FindRequest::ResponseContent_IsStable))
2744 { 2744 {
2745 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeIsStable); 2745 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeIsStable);
2746 } 2746 }
2747 if (item.HasResponseContent(FindRequest::ResponseContent_Labels)) 2747 if (request.HasResponseContent(FindRequest::ResponseContent_Labels))
2748 { 2748 {
2749 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeLabels); 2749 expandFlags = static_cast<ExpandResourceFlags>(expandFlags | ExpandResourceFlags_IncludeLabels);
2750 } 2750 }
2751 2751
2752 Json::Value jsonItem; 2752 Json::Value jsonItem;