Mercurial > hg > orthanc
comparison 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 |
comparison
equal
deleted
inserted
replaced
4503:b525e0c3cff0 | 4504:7d1eabfac6e0 |
---|---|
524 MetricsRegistry::Timer timer(GetMetricsRegistry(), "orthanc_store_dicom_duration_ms"); | 524 MetricsRegistry::Timer timer(GetMetricsRegistry(), "orthanc_store_dicom_duration_ms"); |
525 StorageAccessor accessor(area_, GetMetricsRegistry()); | 525 StorageAccessor accessor(area_, GetMetricsRegistry()); |
526 | 526 |
527 resultPublicId = dicom.GetHasher().HashInstance(); | 527 resultPublicId = dicom.GetHasher().HashInstance(); |
528 | 528 |
529 Json::Value dicomAsJson; | |
530 OrthancConfiguration::DefaultDicomDatasetToJson(dicomAsJson, dicom.GetParsedDicomFile()); | |
531 | |
529 Json::Value simplifiedTags; | 532 Json::Value simplifiedTags; |
530 Toolbox::SimplifyDicomAsJson(simplifiedTags, dicom.GetJson(), DicomToJsonFormat_Human); | 533 Toolbox::SimplifyDicomAsJson(simplifiedTags, dicomAsJson, DicomToJsonFormat_Human); |
531 | 534 |
532 // Test if the instance must be filtered out | 535 // Test if the instance must be filtered out |
533 bool accepted = true; | 536 bool accepted = true; |
534 | 537 |
535 { | 538 { |
576 attachments.push_back(dicomInfo); | 579 attachments.push_back(dicomInfo); |
577 | 580 |
578 FileInfo jsonInfo; | 581 FileInfo jsonInfo; |
579 if (true /* TODO - !area_.HasReadRange() || !hasPixelDataOffset */) | 582 if (true /* TODO - !area_.HasReadRange() || !hasPixelDataOffset */) |
580 { | 583 { |
581 jsonInfo = accessor.Write(dicom.GetJson().toStyledString(), | 584 jsonInfo = accessor.Write(dicomAsJson.toStyledString(), |
582 FileContentType_DicomAsJson, compression, storeMD5_); | 585 FileContentType_DicomAsJson, compression, storeMD5_); |
583 attachments.push_back(jsonInfo); | 586 attachments.push_back(jsonInfo); |
584 } | 587 } |
585 | 588 |
586 typedef std::map<MetadataType, std::string> InstanceMetadata; | 589 typedef std::map<MetadataType, std::string> InstanceMetadata; |