orthanc: OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp comparison

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4693:45bce660ce3a

added routes for bulk anonymization/modification

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 16 Jun 2021 16:44:04 +0200
parents	fcd2dc7c8f31
children	da1edb7d6332

comparison

equal deleted inserted replaced

-:e68edf92e5cc
+:45bce660ce3a
 }
 if (call.ParseJsonRequest(request) &&
 request.isObject())
 {
-bool patientNameReplaced;
+bool patientNameOverridden;
-target.ParseAnonymizationRequest(patientNameReplaced, request);
+target.ParseAnonymizationRequest(patientNameOverridden, request);
-if (patientNameReplaced)
+if (!patientNameOverridden)
 {
-// Overwrite the random Patient's Name by one that is more
+// Override the random Patient's Name by one that is more
 // user-friendly (provided none was specified by the user)
 target.Replace(DICOM_TAG_PATIENT_NAME, GeneratePatientName(OrthancRestApi::GetContext(call)), true);
 }
 }
 else
 }
 }
 else
 {
 modified->Answer(call.GetOutput());
+}
+}
+static ResourceType DetectModifyLevel(const DicomModification& modification)
+{
+if (modification.IsReplaced(DICOM_TAG_PATIENT_ID))
+{
+return ResourceType_Patient;
+}
+else if (modification.IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
+{
+return ResourceType_Study;
+}
+else if (modification.IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
+{
+return ResourceType_Series;
+}
+else
+{
+return ResourceType_Instance;
 }
 }
 static void ModifyInstance(RestApiPostCall& call)
 modification.SetAllowManualIdentifiers(true);
 Json::Value request;
 ParseModifyRequest(request, modification, call);
-if (modification.IsReplaced(DICOM_TAG_PATIENT_ID))
+modification.SetLevel(DetectModifyLevel(modification));
-{
-modification.SetLevel(ResourceType_Patient);
-}
-else if (modification.IsReplaced(DICOM_TAG_STUDY_INSTANCE_UID))
-{
-modification.SetLevel(ResourceType_Study);
-}
-else if (modification.IsReplaced(DICOM_TAG_SERIES_INSTANCE_UID))
-{
-modification.SetLevel(ResourceType_Series);
-}
-else
-{
-modification.SetLevel(ResourceType_Instance);
-}
 static const char* TRANSCODE = "Transcode";
 if (request.isMember(TRANSCODE))
 {
 std::string s = SerializationToolbox::ReadString(request, TRANSCODE);
 static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
 bool isAnonymization,
 RestApiPostCall& call,
 const Json::Value& body,
-ResourceType level)
+ResourceType outputLevel /* unused for multiple resources */,
+bool isSingleResource,
+const std::set<std::string>& resources)
 {
 ServerContext& context = OrthancRestApi::GetContext(call);
 std::unique_ptr<ResourceModificationJob> job(new ResourceModificationJob(context));
-job->SetModification(modification.release(), level, isAnonymization);
+if (isSingleResource)  // This notably configures the output format
+{
+job->SetSingleResourceModification(modification.release(), outputLevel, isAnonymization);
+}
+else
+{
+job->SetMultipleResourcesModification(modification.release(), isAnonymization);
+}
 job->SetOrigin(call);
 SetKeepSource(*job, body);
 static const char* TRANSCODE = "Transcode";
 if (body.isMember(TRANSCODE))
 {
 job->SetTranscode(SerializationToolbox::ReadString(body, TRANSCODE));
 }
+for (std::set<std::string>::const_iterator
+it = resources.begin(); it != resources.end(); ++it)
+{
+context.AddChildInstances(*job, *it);
+}
-context.AddChildInstances(*job, call.GetUriComponent("id", ""));
 job->AddTrailingStep();
 OrthancRestApi::GetApi(call).SubmitCommandsJob
 (call, job.release(), true /* synchronous by default */, body);
+}
+static void SubmitModificationJob(std::unique_ptr<DicomModification>& modification,
+bool isAnonymization,
+RestApiPostCall& call,
+const Json::Value& body,
+ResourceType outputLevel)
+{
+// This was the only flavor in Orthanc <= 1.9.3
+std::set<std::string> resources;
+resources.insert(call.GetUriComponent("id", ""));
+SubmitModificationJob(modification, isAnonymization, call, body, outputLevel,
+true /* single resource */, resources);
+}
+static void SubmitBulkJob(std::unique_ptr<DicomModification>& modification,
+bool isAnonymization,
+RestApiPostCall& call,
+const Json::Value& body)
+{
+std::set<std::string> resources;
+SerializationToolbox::ReadSetOfStrings(resources, body, "Resources");
+SubmitModificationJob(modification, isAnonymization,
+call, body, ResourceType_Instance /* arbitrary value, unused */,
+false /* multiple resources */, resources);
 }
 template <enum ResourceType resourceType>
 static void ModifyResource(RestApiPostCall& call)
 Json::Value body;
 ParseModifyRequest(body, *modification, call);
 modification->SetLevel(resourceType);
 SubmitModificationJob(modification, false /* not an anonymization */,
 call, body, resourceType);
+}
+// New in Orthanc 1.9.4
+static void BulkModify(RestApiPostCall& call)
+{
+if (call.IsDocumentation())
+{
+OrthancRestApi::DocumentSubmitCommandsJob(call);
+DocumentModifyOptions(call);
+call.GetDocumentation()
+.SetTag("System")
+.SetSummary("Modify a set of instances")
+.SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
+"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", false)
+.SetDescription("Start a job that will modify all the DICOM patients, studies, series or instances "
+"whose identifiers are provided in the `Resources` field.")
+.AddAnswerType(MimeType_Json, "The list of all the resources that have been altered by this modification");
+return;
+}
+std::unique_ptr<DicomModification> modification(new DicomModification);
+Json::Value body;
+ParseModifyRequest(body, *modification, call);
+modification->SetLevel(DetectModifyLevel(*modification));
+SubmitBulkJob(modification, false /* not an anonymization */, call, body);
 }
 template <enum ResourceType resourceType>
 static void AnonymizeResource(RestApiPostCall& call)
 Json::Value body;
 ParseAnonymizationRequest(body, *modification, call);
 SubmitModificationJob(modification, true /* anonymization */,
 call, body, resourceType);
+}
+// New in Orthanc 1.9.4
+static void BulkAnonymize(RestApiPostCall& call)
+{
+if (call.IsDocumentation())
+{
+OrthancRestApi::DocumentSubmitCommandsJob(call);
+DocumentAnonymizationOptions(call);
+call.GetDocumentation()
+.SetTag("System")
+.SetSummary("Anonymize a set of instances")
+.SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
+"List of the Orthanc identifiers of the patients/studies/series/instances of interest.", false)
+.SetDescription("Start a job that will anonymize all the DICOM patients, studies, series or instances "
+"whose identifiers are provided in the `Resources` field.")
+.AddAnswerType(MimeType_Json, "The list of all the resources that have been created by this anonymization");
+return;
+}
+std::unique_ptr<DicomModification> modification(new DicomModification);
+Json::Value body;
+ParseAnonymizationRequest(body, *modification, call);
+SubmitBulkJob(modification, true /* anonymization */, call, body);
 }
 static void StoreCreatedInstance(std::string& id /* out */,
 RestApiPostCall& call,
 {
 Register("/instances/{id}/modify", ModifyInstance);
 Register("/series/{id}/modify", ModifyResource<ResourceType_Series>);
 Register("/studies/{id}/modify", ModifyResource<ResourceType_Study>);
 Register("/patients/{id}/modify", ModifyResource<ResourceType_Patient>);
+Register("/tools/bulk-modify", BulkModify);
 Register("/instances/{id}/anonymize", AnonymizeInstance);
 Register("/series/{id}/anonymize", AnonymizeResource<ResourceType_Series>);
 Register("/studies/{id}/anonymize", AnonymizeResource<ResourceType_Study>);
 Register("/patients/{id}/anonymize", AnonymizeResource<ResourceType_Patient>);
+Register("/tools/bulk-anonymize", BulkAnonymize);
 Register("/tools/create-dicom", CreateDicom);
 Register("/studies/{id}/split", SplitStudy);
 Register("/studies/{id}/merge", MergeStudy);

Mercurial > hg > orthanc

comparison OrthancServer/Sources/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 4693:45bce660ce3a