Mercurial > hg > orthanc

comparison OrthancServer/Sources/main.cpp @ 4504:7d1eabfac6e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed cached dicom-as-json from DicomInstanceToStore
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Feb 2021 11:29:53 +0100
parents e3e759cbd19c
children 97d103b57cd1
comparison
equal deleted inserted replaced
4503:b525e0c3cff0 4504:7d1eabfac6e0
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; 91 DicomMap dicomSummary;
92 Json::Value dicomJson;
93 std::string dicomFile; 92 std::string dicomFile;
94 93
95 const std::set<DicomTag> ignoreTagLength; 94 const std::set<DicomTag> ignoreTagLength;
96 95
97 // TODO => Parameters in class "DicomServer" 96 // TODO => Parameters in class "DicomServer"
98 FromDcmtkBridge::ExtractDicomSummary(dicomSummary, dicom, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength); 97 FromDcmtkBridge::ExtractDicomSummary(dicomSummary, dicom, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
99 FromDcmtkBridge::ExtractDicomAsJson(dicomJson, dicom, DicomToJsonFormat_Full,
100 DicomToJsonFlags_Default, ORTHANC_MAXIMUM_TAG_LENGTH, ignoreTagLength);
101 98
102 if (!FromDcmtkBridge::SaveToMemoryBuffer(dicomFile, dicom)) 99 if (!FromDcmtkBridge::SaveToMemoryBuffer(dicomFile, dicom))
103 { 100 {
104 throw OrthancException(ErrorCode_InternalError, "Cannot write DICOM file to memory"); 101 throw OrthancException(ErrorCode_InternalError, "Cannot write DICOM file to memory");
105 } 102 }
109 DicomInstanceToStore toStore; 106 DicomInstanceToStore toStore;
110 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol 107 toStore.SetOrigin(DicomInstanceOrigin::FromDicomProtocol
111 (remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str())); 108 (remoteIp.c_str(), remoteAet.c_str(), calledAet.c_str()));
112 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size()); 109 toStore.SetBuffer(dicomFile.c_str(), dicomFile.size());
113 toStore.SetSummary(dicomSummary); 110 toStore.SetSummary(dicomSummary);
114 toStore.SetJson(dicomJson);
115 111
116 std::string id; 112 std::string id;
117 context_.Store(id, toStore, StoreInstanceMode_Default); 113 context_.Store(id, toStore, StoreInstanceMode_Default);
118 } 114 }
119 } 115 }