comparison Platforms/Generic/WebServiceGetCommand.cpp @ 417:aee3d7941c9b

preparing to load images using DICOMweb
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 15 Nov 2018 17:28:15 +0100
parents 14ef1227120f
children b70e9be013e4
comparison
equal deleted inserted replaced
415:c0589c3173fd 417:aee3d7941c9b
28 28
29 WebServiceGetCommand::WebServiceGetCommand(MessageBroker& broker, 29 WebServiceGetCommand::WebServiceGetCommand(MessageBroker& broker,
30 MessageHandler<IWebService::HttpRequestSuccessMessage>* successCallback, // takes ownership 30 MessageHandler<IWebService::HttpRequestSuccessMessage>* successCallback, // takes ownership
31 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback, // takes ownership 31 MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback, // takes ownership
32 const Orthanc::WebServiceParameters& parameters, 32 const Orthanc::WebServiceParameters& parameters,
33 const std::string& uri, 33 const std::string& url,
34 const IWebService::Headers& headers, 34 const IWebService::HttpHeaders& headers,
35 unsigned int timeoutInSeconds, 35 unsigned int timeoutInSeconds,
36 Orthanc::IDynamicObject* payload /* takes ownership */, 36 Orthanc::IDynamicObject* payload /* takes ownership */,
37 NativeStoneApplicationContext& context) : 37 NativeStoneApplicationContext& context) :
38 WebServiceCommandBase(broker, successCallback, failureCallback, parameters, uri, headers, timeoutInSeconds, payload, context) 38 WebServiceCommandBase(broker, successCallback, failureCallback, parameters, url, headers, timeoutInSeconds, payload, context)
39 { 39 {
40 } 40 }
41 41
42 42
43 void WebServiceGetCommand::Execute() 43 void WebServiceGetCommand::Execute()
44 { 44 {
45 Orthanc::HttpClient client(parameters_, uri_); 45 Orthanc::HttpClient client(parameters_, "/");
46 client.SetUrl(url_);
46 client.SetTimeout(timeoutInSeconds_); 47 client.SetTimeout(timeoutInSeconds_);
47 client.SetMethod(Orthanc::HttpMethod_Get); 48 client.SetMethod(Orthanc::HttpMethod_Get);
48 49
49 for (IWebService::Headers::const_iterator it = headers_.begin(); it != headers_.end(); it++ ) 50 for (IWebService::HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); it++ )
50 { 51 {
51 client.AddHeader(it->first, it->second); 52 client.AddHeader(it->first, it->second);
52 } 53 }
53 54
54 success_ = client.Apply(answer_); 55 success_ = client.Apply(answer_, answerHeaders_);
55 } 56 }
56 57
57 } 58 }