Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancWebDav.cpp @ 4935:acd3f72e2a21 more-tags
split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system
author | Alain Mazy <am@osimis.io> |
---|---|
date | Thu, 10 Mar 2022 19:00:43 +0100 |
parents | 6eff25f70121 |
children | 8422e4f99a18 |
comparison
equal
deleted
inserted
replaced
4934:94a7b681b340 | 4935:acd3f72e2a21 |
---|---|
257 const std::string& instanceId /* unused */, | 257 const std::string& instanceId /* unused */, |
258 const DicomMap& mainDicomTags, | 258 const DicomMap& mainDicomTags, |
259 const Json::Value* dicomAsJson /* unused (*) */) ORTHANC_OVERRIDE | 259 const Json::Value* dicomAsJson /* unused (*) */) ORTHANC_OVERRIDE |
260 { | 260 { |
261 Json::Value resource; | 261 Json::Value resource; |
262 if (context_.GetIndex().ExpandResource(resource, publicId, level_, DicomToJsonFormat_Human)) | 262 if (context_.ExpandResource(resource, publicId, level_, DicomToJsonFormat_Human)) |
263 { | 263 { |
264 if (success_) | 264 if (success_) |
265 { | 265 { |
266 success_ = false; // Two matches => Error | 266 success_ = false; // Two matches => Error |
267 } | 267 } |