Mercurial > hg > orthanc
comparison OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp @ 4505:97d103b57cd1
removed cached dicom summary from DicomInstanceToStore
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 10 Feb 2021 12:07:03 +0100 |
parents | d9473bd5ed43 |
children | b4c58795f3a8 |
comparison
equal
deleted
inserted
replaced
4504:7d1eabfac6e0 | 4505:97d103b57cd1 |
---|---|
37 #include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" | 37 #include "../../../OrthancFramework/Sources/Compression/GzipCompressor.h" |
38 #include "../../../OrthancFramework/Sources/Compression/ZipReader.h" | 38 #include "../../../OrthancFramework/Sources/Compression/ZipReader.h" |
39 #include "../../../OrthancFramework/Sources/Logging.h" | 39 #include "../../../OrthancFramework/Sources/Logging.h" |
40 #include "../../../OrthancFramework/Sources/MetricsRegistry.h" | 40 #include "../../../OrthancFramework/Sources/MetricsRegistry.h" |
41 #include "../../../OrthancFramework/Sources/SerializationToolbox.h" | 41 #include "../../../OrthancFramework/Sources/SerializationToolbox.h" |
42 #include "../OrthancConfiguration.h" | |
42 #include "../ServerContext.h" | 43 #include "../ServerContext.h" |
43 | 44 |
44 #include <boost/algorithm/string/predicate.hpp> | 45 #include <boost/algorithm/string/predicate.hpp> |
45 | 46 |
46 namespace Orthanc | 47 namespace Orthanc |
67 StoreStatus status, | 68 StoreStatus status, |
68 const std::string& instanceId) | 69 const std::string& instanceId) |
69 { | 70 { |
70 SetupResourceAnswer(result, instanceId, ResourceType_Instance, status); | 71 SetupResourceAnswer(result, instanceId, ResourceType_Instance, status); |
71 | 72 |
72 result["ParentPatient"] = instance.GetHasher().HashPatient(); | 73 DicomMap summary; |
73 result["ParentStudy"] = instance.GetHasher().HashStudy(); | 74 OrthancConfiguration::DefaultExtractDicomSummary(summary, instance.GetParsedDicomFile()); |
74 result["ParentSeries"] = instance.GetHasher().HashSeries(); | 75 |
76 DicomInstanceHasher hasher(summary); | |
77 result["ParentPatient"] = hasher.HashPatient(); | |
78 result["ParentStudy"] = hasher.HashStudy(); | |
79 result["ParentSeries"] = hasher.HashSeries(); | |
75 } | 80 } |
76 | 81 |
77 | 82 |
78 void OrthancRestApi::AnswerStoredInstance(RestApiPostCall& call, | 83 void OrthancRestApi::AnswerStoredInstance(RestApiPostCall& call, |
79 DicomInstanceToStore& instance, | 84 DicomInstanceToStore& instance, |