diff 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
line wrap: on
line diff
--- a/Platforms/Generic/WebServiceGetCommand.cpp	Tue Nov 13 10:36:53 2018 +0100
+++ b/Platforms/Generic/WebServiceGetCommand.cpp	Thu Nov 15 17:28:15 2018 +0100
@@ -30,28 +30,29 @@
                                              MessageHandler<IWebService::HttpRequestSuccessMessage>* successCallback,  // takes ownership
                                              MessageHandler<IWebService::HttpRequestErrorMessage>* failureCallback,  // takes ownership
                                              const Orthanc::WebServiceParameters& parameters,
-                                             const std::string& uri,
-                                             const IWebService::Headers& headers,
+                                             const std::string& url,
+                                             const IWebService::HttpHeaders& headers,
                                              unsigned int timeoutInSeconds,
                                              Orthanc::IDynamicObject* payload /* takes ownership */,
                                              NativeStoneApplicationContext& context) :
-    WebServiceCommandBase(broker, successCallback, failureCallback, parameters, uri, headers, timeoutInSeconds, payload, context)
+    WebServiceCommandBase(broker, successCallback, failureCallback, parameters, url, headers, timeoutInSeconds, payload, context)
   {
   }
 
 
   void WebServiceGetCommand::Execute()
   {
-    Orthanc::HttpClient client(parameters_, uri_);
+    Orthanc::HttpClient client(parameters_, "/");
+    client.SetUrl(url_);
     client.SetTimeout(timeoutInSeconds_);
     client.SetMethod(Orthanc::HttpMethod_Get);
 
-    for (IWebService::Headers::const_iterator it = headers_.begin(); it != headers_.end(); it++ )
+    for (IWebService::HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); it++ )
     {
       client.AddHeader(it->first, it->second);
     }
 
-    success_ = client.Apply(answer_);
+    success_ = client.Apply(answer_, answerHeaders_);
   }
 
 }