comparison OrthancServer/Sources/main.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 7d1eabfac6e0
children 8f9090b137f1
comparison
equal deleted inserted replaced
4504:7d1eabfac6e0 4505:97d103b57cd1
86 virtual void Handle(DcmDataset& dicom, 86 virtual void Handle(DcmDataset& dicom,
87 const std::string& remoteIp, 87 const std::string& remoteIp,
88 const std::string& remoteAet, 88 const std::string& remoteAet,
89 const std::string& calledAet) ORTHANC_OVERRIDE 89 const std::string& calledAet) ORTHANC_OVERRIDE
90 { 90 {
91 DicomMap dicomSummary;
92 std::string dicomFile; 91 std::string dicomFile;
93
94 const std::set<DicomTag> ignoreTagLength;
95
96 // TODO => Parameters in class "DicomServer"
97 FromDcmtkBridge::ExtractDicomSummary(dicomSummary, dicom, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
98 92
99 if (!FromDcmtkBridge::SaveToMemoryBuffer(dicomFile, dicom)) 93 if (!FromDcmtkBridge::SaveToMemoryBuffer(dicomFile, dicom))
100 { 94 {
101 throw OrthancException(ErrorCode_InternalError, "Cannot write DICOM file to memory"); 95 throw OrthancException(ErrorCode_InternalError, "Cannot write DICOM file to memory");
102 } 96 }
105 { 99 {
106 DicomInstanceToStore toStore; 100 DicomInstanceToStore toStore;
107 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol 101 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol
108 (remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str())); 102 (remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str()));
109 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size()); 103 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size());
110 toStore.SetSummary(dicomSummary);
111 104
112 std::string id; 105 std::string id;
113 context_.Store(id, toStore, StoreInstanceMode_Default); 106 context_.Store(id, toStore, StoreInstanceMode_Default);
114 } 107 }
115 } 108 }