Mercurial > hg > orthanc
diff OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1572:904096e7367e
More information about the origin request in OnStoredInstance() callbacks
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 25 Aug 2015 12:10:12 +0200 |
parents | 2bd2c280f9b5 |
children | bd1889029cbb |
line wrap: on
line diff
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp Tue Aug 25 11:04:19 2015 +0200 +++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp Tue Aug 25 12:10:12 2015 +0200 @@ -278,6 +278,7 @@ modification.Apply(*modified); DicomInstanceToStore toStore; + toStore.SetRestOrigin(call); toStore.SetParsedDicomFile(*modified); @@ -431,12 +432,14 @@ static void StoreCreatedInstance(std::string& id /* out */, - ServerContext& context, + RestApiPostCall& call, ParsedDicomFile& dicom) { DicomInstanceToStore toStore; + toStore.SetRestOrigin(call); toStore.SetParsedDicomFile(dicom); + ServerContext& context = OrthancRestApi::GetContext(call); StoreStatus status = context.Store(id, toStore); if (status == StoreStatus_Failure) @@ -447,6 +450,7 @@ static void CreateDicomV1(ParsedDicomFile& dicom, + RestApiPostCall& call, const Json::Value& request) { // curl http://localhost:8042/tools/create-dicom -X POST -d '{"PatientName":"Hello^World"}' @@ -570,7 +574,7 @@ dicom->Replace(DICOM_TAG_INSTANCE_NUMBER, boost::lexical_cast<std::string>(i + 1)); dicom->Replace(DICOM_TAG_IMAGE_INDEX, boost::lexical_cast<std::string>(i + 1)); - StoreCreatedInstance(someInstance, context, *dicom); + StoreCreatedInstance(someInstance, call, *dicom); } } catch (OrthancException& e) @@ -785,7 +789,7 @@ } std::string id; - StoreCreatedInstance(id, context, dicom); + StoreCreatedInstance(id, call, dicom); OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success); return; @@ -808,12 +812,11 @@ else { // Compatibility with Orthanc <= 0.9.3 - ServerContext& context = OrthancRestApi::GetContext(call); ParsedDicomFile dicom; - CreateDicomV1(dicom, request); + CreateDicomV1(dicom, call, request); std::string id; - StoreCreatedInstance(id, context, dicom); + StoreCreatedInstance(id, call, dicom); OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success); } }