Mercurial > hg > orthanc
diff OrthancServer/Sources/ServerContext.cpp @ 4504:7d1eabfac6e0
removed cached dicom-as-json from DicomInstanceToStore
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Feb 2021 11:29:53 +0100 |
parents | 3b4940bca158 |
children | 97d103b57cd1 |
line wrap: on
line diff
--- a/OrthancServer/Sources/ServerContext.cpp Tue Feb 09 17:05:45 2021 +0100 +++ b/OrthancServer/Sources/ServerContext.cpp Wed Feb 10 11:29:53 2021 +0100 @@ -526,8 +526,11 @@ resultPublicId = dicom.GetHasher().HashInstance(); + Json::Value dicomAsJson; + OrthancConfiguration::DefaultDicomDatasetToJson(dicomAsJson, dicom.GetParsedDicomFile()); + Json::Value simplifiedTags; - Toolbox::SimplifyDicomAsJson(simplifiedTags, dicom.GetJson(), DicomToJsonFormat_Human); + Toolbox::SimplifyDicomAsJson(simplifiedTags, dicomAsJson, DicomToJsonFormat_Human); // Test if the instance must be filtered out bool accepted = true; @@ -578,7 +581,7 @@ FileInfo jsonInfo; if (true /* TODO - !area_.HasReadRange() || !hasPixelDataOffset */) { - jsonInfo = accessor.Write(dicom.GetJson().toStyledString(), + jsonInfo = accessor.Write(dicomAsJson.toStyledString(), FileContentType_DicomAsJson, compression, storeMD5_); attachments.push_back(jsonInfo); }