annotate OrthancStone/Sources/Toolbox/OrthancDatasets/OrthancHttpConnection.cpp @ 1776:d3d883c3af65

backward compatibility with Orthanc framework <= 1.9.2
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 May 2021 07:34:14 +0200
parents e38b9875a969
children 3889ae96d2e9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Stone of Orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
1739
9ac2a65d4172 upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1598
diff changeset
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
8 * modify it under the terms of the GNU Lesser General Public License
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * as published by the Free Software Foundation, either version 3 of
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * the License, or (at your option) any later version.
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * This program is distributed in the hope that it will be useful, but
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
15 * Lesser General Public License for more details.
1596
4fb8fdf03314 removed annoying whitespace
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1512
diff changeset
16 *
1598
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
18 * License along with this program. If not, see
8563ea5d8ae4 relicensing some files, cf. osimis bm26 and chu agreement on 2020-05-20
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1596
diff changeset
19 * <http://www.gnu.org/licenses/>.
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "OrthancHttpConnection.h"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 namespace OrthancStone
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 void OrthancHttpConnection::Setup()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 url_ = client_.GetUrl();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 // Don't follow 3xx HTTP (avoid redirections to "unsupported.png" in Orthanc)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32 client_.SetRedirectionFollowed(false);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 OrthancHttpConnection::OrthancHttpConnection() :
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 client_(Orthanc::WebServiceParameters(), "")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 Setup();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 OrthancHttpConnection::OrthancHttpConnection(const Orthanc::WebServiceParameters& parameters) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 client_(parameters, "")
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 Setup();
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 void OrthancHttpConnection::RestApiGet(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 const std::string& uri)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 boost::mutex::scoped_lock lock(mutex_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 client_.SetMethod(Orthanc::HttpMethod_Get);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 client_.SetUrl(url_ + uri);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 client_.ApplyAndThrowException(result);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 void OrthancHttpConnection::RestApiPost(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 const std::string& uri,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 const std::string& body)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 boost::mutex::scoped_lock lock(mutex_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 client_.SetMethod(Orthanc::HttpMethod_Post);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 client_.SetUrl(url_ + uri);
1776
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
69
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
70 #if defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE) && ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 3)
1760
e38b9875a969 adaptation to change in API of Orthanc::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
71 client_.SetExternalBody(body);
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 client_.ApplyAndThrowException(result);
1760
e38b9875a969 adaptation to change in API of Orthanc::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
73 client_.ClearBody();
1776
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
74 #else
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
75 client_.SetBody(body);
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
76 client_.ApplyAndThrowException(result);
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
77 #endif
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 void OrthancHttpConnection::RestApiPut(std::string& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 const std::string& uri,
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 const std::string& body)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
85 boost::mutex::scoped_lock lock(mutex_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
87 client_.SetMethod(Orthanc::HttpMethod_Put);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
88 client_.SetUrl(url_ + uri);
1776
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
89
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
90 #if defined(ORTHANC_FRAMEWORK_VERSION_IS_ABOVE) && ORTHANC_FRAMEWORK_VERSION_IS_ABOVE(1, 9, 3)
1760
e38b9875a969 adaptation to change in API of Orthanc::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
91 client_.SetExternalBody(body);
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
92 client_.ApplyAndThrowException(result);
1760
e38b9875a969 adaptation to change in API of Orthanc::HttpClient
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1739
diff changeset
93 client_.ClearBody();
1776
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
94 #else
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
95 client_.SetBody(body);
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
96 client_.ApplyAndThrowException(result);
d3d883c3af65 backward compatibility with Orthanc framework <= 1.9.2
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1760
diff changeset
97 #endif
1504
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
98 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
99
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
100
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 void OrthancHttpConnection::RestApiDelete(const std::string& uri)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
102 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
103 boost::mutex::scoped_lock lock(mutex_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
104
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
105 std::string result;
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
106
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
107 client_.SetMethod(Orthanc::HttpMethod_Delete);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 client_.SetUrl(url_ + uri);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
109 client_.ApplyAndThrowException(result);
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
110 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
111 }