Mercurial > hg > orthanc
diff OrthancServer/Sources/ServerContext.h @ 4940:304514ce84ee more-tags
tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags'
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 15 Mar 2022 15:57:21 +0100 |
parents | e8a2e145c80e |
children | 2cfa50d8eb60 |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.h Tue Mar 15 09:09:52 2022 +0100 +++ b/OrthancServer/Sources/ServerContext.h Tue Mar 15 15:57:21 2022 +0100 @@ -548,18 +548,21 @@ bool ExpandResource(Json::Value& target, const std::string& publicId, + const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) const std::string& instanceId, // optional: the id of an instance for the resource - const Json::Value& dicomAsJson, // optional: the dicom-as-json for the resource + const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource ResourceType level, DicomToJsonFormat format, const std::set<DicomTag>& requestedTags); bool ExpandResource(ExpandedResource& target, const std::string& publicId, + const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) const std::string& instanceId, // optional: the id of an instance for the resource - const Json::Value& dicomAsJson, // optional: the dicom-as-json for the resource + const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource ResourceType level, - const std::set<DicomTag>& requestedTags); + const std::set<DicomTag>& requestedTags, + ExpandResourceDbFlags expandFlags); }; }