Mercurial > hg > orthanc

comparison Core/DicomNetworking/Internals/CommandDispatcher.cpp @ 3713:56f2397f027a storage-commitment

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 15:42:17 +0100
parents bd34b6ac5c08 2a170a8f1faf
children 0540b54324f1
comparison
equal deleted inserted replaced
3711:14b363d972a8 3713:56f2397f027a
88 #endif 88 #endif
89 89
90 #include "FindScp.h" 90 #include "FindScp.h"
91 #include "StoreScp.h" 91 #include "StoreScp.h"
92 #include "MoveScp.h" 92 #include "MoveScp.h"
93 #include "../../Compatibility.h"
93 #include "../../Toolbox.h" 94 #include "../../Toolbox.h"
94 #include "../../Logging.h" 95 #include "../../Logging.h"
95 #include "../../OrthancException.h" 96 #include "../../OrthancException.h"
96 97
97 #include <dcmtk/dcmdata/dcdeftag.h> /* for storage commitment */ 98 #include <dcmtk/dcmdata/dcdeftag.h> /* for storage commitment */
780 break; 781 break;
781 782
782 case DicomRequestType_Store: 783 case DicomRequestType_Store:
783 if (server_.HasStoreRequestHandlerFactory()) // Should always be true 784 if (server_.HasStoreRequestHandlerFactory()) // Should always be true
784 { 785 {
785 std::auto_ptr<IStoreRequestHandler> handler 786 std::unique_ptr<IStoreRequestHandler> handler
786 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler()); 787 (server_.GetStoreRequestHandlerFactory().ConstructStoreRequestHandler());
787 788
788 if (handler.get() != NULL) 789 if (handler.get() != NULL)
789 { 790 {
790 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_); 791 cond = Internals::storeScp(assoc_, &msg, presID, *handler, remoteIp_, associationTimeout_);
793 break; 794 break;
794 795
795 case DicomRequestType_Move: 796 case DicomRequestType_Move:
796 if (server_.HasMoveRequestHandlerFactory()) // Should always be true 797 if (server_.HasMoveRequestHandlerFactory()) // Should always be true
797 { 798 {
798 std::auto_ptr<IMoveRequestHandler> handler 799 std::unique_ptr<IMoveRequestHandler> handler
799 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler()); 800 (server_.GetMoveRequestHandlerFactory().ConstructMoveRequestHandler());
800 801
801 if (handler.get() != NULL) 802 if (handler.get() != NULL)
802 { 803 {
803 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_); 804 cond = Internals::moveScp(assoc_, &msg, presID, *handler, remoteIp_, remoteAet_, calledAet_, associationTimeout_);
807 808
808 case DicomRequestType_Find: 809 case DicomRequestType_Find:
809 if (server_.HasFindRequestHandlerFactory() || // Should always be true 810 if (server_.HasFindRequestHandlerFactory() || // Should always be true
810 server_.HasWorklistRequestHandlerFactory()) 811 server_.HasWorklistRequestHandlerFactory())
811 { 812 {
812 std::auto_ptr<IFindRequestHandler> findHandler; 813 std::unique_ptr<IFindRequestHandler> findHandler;
813 if (server_.HasFindRequestHandlerFactory()) 814 if (server_.HasFindRequestHandlerFactory())
814 { 815 {
815 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler()); 816 findHandler.reset(server_.GetFindRequestHandlerFactory().ConstructFindRequestHandler());
816 } 817 }
817 818
818 std::auto_ptr<IWorklistRequestHandler> worklistHandler; 819 std::unique_ptr<IWorklistRequestHandler> worklistHandler;
819 if (server_.HasWorklistRequestHandlerFactory()) 820 if (server_.HasWorklistRequestHandlerFactory())
820 { 821 {
821 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler()); 822 worklistHandler.reset(server_.GetWorklistRequestHandlerFactory().ConstructWorklistRequestHandler());
822 } 823 }
823 824