Mercurial > hg > orthanc

comparison OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp @ 1570:2bd2c280f9b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix indentation
author jodogne
date Sun, 23 Aug 2015 11:13:03 +0200
parents 27774f6f84e4
children 904096e7367e
comparison
equal deleted inserted replaced
1569:27774f6f84e4 1570:2bd2c280f9b5
553 } 553 }
554 554
555 payload = &content[i]["Content"]; 555 payload = &content[i]["Content"];
556 556
557 if (content[i].isMember("Tags")) 557 if (content[i].isMember("Tags"))
558 { 558 {
559 InjectTags(*dicom, content[i]["Tags"]); 559 InjectTags(*dicom, content[i]["Tags"]);
560 } 560 }
561 } 561 }
562 562
563 if (payload == NULL || 563 if (payload == NULL ||
564 payload->type() != Json::stringValue) 564 payload->type() != Json::stringValue)
565 { 565 {
577 { 577 {
578 // Error: Remove the newly-created series 578 // Error: Remove the newly-created series
579 579
580 std::string series; 580 std::string series;
581 if (context.GetIndex().LookupParent(series, someInstance)) 581 if (context.GetIndex().LookupParent(series, someInstance))
582 { 582 {
583 Json::Value dummy; 583 Json::Value dummy;
584 context.GetIndex().DeleteResource(dummy, series, ResourceType_Series); 584 context.GetIndex().DeleteResource(dummy, series, ResourceType_Series);
585 } 585 }
586 586
587 throw e; 587 throw e;
588 } 588 }
589 589
590 std::string series; 590 std::string series;
795 static void CreateDicom(RestApiPostCall& call) 795 static void CreateDicom(RestApiPostCall& call)
796 { 796 {
797 Json::Value request; 797 Json::Value request;
798 if (!call.ParseJsonRequest(request) || 798 if (!call.ParseJsonRequest(request) ||
799 !request.isObject()) 799 !request.isObject())
800 { 800 {
801 throw OrthancException(ErrorCode_BadRequest); 801 throw OrthancException(ErrorCode_BadRequest);
802 } 802 }
803 803
804 if (request.isMember("Tags")) 804 if (request.isMember("Tags"))
805 { 805 {
806 CreateDicomV2(call, request); 806 CreateDicomV2(call, request);
807 } 807 }
808 else 808 else
809 { 809 {
810 // Compatibility with Orthanc <= 0.9.3 810 // Compatibility with Orthanc <= 0.9.3
811 ServerContext& context = OrthancRestApi::GetContext(call); 811 ServerContext& context = OrthancRestApi::GetContext(call);
812 ParsedDicomFile dicom; 812 ParsedDicomFile dicom;
813 CreateDicomV1(dicom, request); 813 CreateDicomV1(dicom, request);
814 814
815 std::string id; 815 std::string id;
816 StoreCreatedInstance(id, context, dicom); 816 StoreCreatedInstance(id, context, dicom);
817 OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success); 817 OrthancRestApi::GetApi(call).AnswerStoredResource(call, id, ResourceType_Instance, StoreStatus_Success);
818 } 818 }
819 } 819 }
820 820
821 821
822 void OrthancRestApi::RegisterAnonymizeModify() 822 void OrthancRestApi::RegisterAnonymizeModify()
823 { 823 {