Mercurial > hg > orthanc
comparison 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 |
comparison
equal
deleted
inserted
replaced
4939:e8a2e145c80e | 4940:304514ce84ee |
---|---|
546 DicomToJsonFormat format, | 546 DicomToJsonFormat format, |
547 const std::set<DicomTag>& requestedTags); | 547 const std::set<DicomTag>& requestedTags); |
548 | 548 |
549 bool ExpandResource(Json::Value& target, | 549 bool ExpandResource(Json::Value& target, |
550 const std::string& publicId, | 550 const std::string& publicId, |
551 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) | |
551 const std::string& instanceId, // optional: the id of an instance for the resource | 552 const std::string& instanceId, // optional: the id of an instance for the resource |
552 const Json::Value& dicomAsJson, // optional: the dicom-as-json for the resource | 553 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource |
553 ResourceType level, | 554 ResourceType level, |
554 DicomToJsonFormat format, | 555 DicomToJsonFormat format, |
555 const std::set<DicomTag>& requestedTags); | 556 const std::set<DicomTag>& requestedTags); |
556 | 557 |
557 bool ExpandResource(ExpandedResource& target, | 558 bool ExpandResource(ExpandedResource& target, |
558 const std::string& publicId, | 559 const std::string& publicId, |
560 const DicomMap& mainDicomTags, // optional: the main dicom tags for the resource (if already available) | |
559 const std::string& instanceId, // optional: the id of an instance for the resource | 561 const std::string& instanceId, // optional: the id of an instance for the resource |
560 const Json::Value& dicomAsJson, // optional: the dicom-as-json for the resource | 562 const Json::Value* dicomAsJson, // optional: the dicom-as-json for the resource |
561 ResourceType level, | 563 ResourceType level, |
562 const std::set<DicomTag>& requestedTags); | 564 const std::set<DicomTag>& requestedTags, |
565 ExpandResourceDbFlags expandFlags); | |
563 | 566 |
564 }; | 567 }; |
565 } | 568 } |