Mercurial > hg > orthanc

annotate Plugins/Samples/Common/OrthancHttpConnection.cpp @ 2665:389d050a2e66 jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix deadlock, speed up unit tests
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 08 Jun 2018 13:51:31 +0200
parents 878b59270859
children 4e43e67f8ecf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2179
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
2447
878b59270859 upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
5 * Copyright (C) 2017-2018 Osimis S.A., Belgium
2179
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 *
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * In addition, as a special exception, the copyright holders of this
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * program give permission to link the code of its release with the
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * the linked executables. You must obey the GNU General Public License
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * you do not wish to do so, delete this exception statement from your
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * version. If you delete this exception statement from all source files
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 * in the program, then also delete it here.
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "OrthancHttpConnection.h"
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 namespace OrthancPlugins
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 void OrthancHttpConnection::Setup()
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 url_ = client_.GetUrl();
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 // Don't follow 3xx HTTP (avoid redirections to "unsupported.png" in Orthanc)
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 client_.SetRedirectionFollowed(false);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 }
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 OrthancHttpConnection::OrthancHttpConnection() :
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 client_(Orthanc::WebServiceParameters(), "")
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 Setup();
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 }
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 OrthancHttpConnection::OrthancHttpConnection(const Orthanc::WebServiceParameters& parameters) :
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 client_(parameters, "")
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 Setup();
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
58 }
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
61 void OrthancHttpConnection::RestApiGet(std::string& result,
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
62 const std::string& uri)
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 boost::mutex::scoped_lock lock(mutex_);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 client_.SetMethod(Orthanc::HttpMethod_Get);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 client_.SetUrl(url_ + uri);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 client_.ApplyAndThrowException(result);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 }
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
71
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 void OrthancHttpConnection::RestApiPost(std::string& result,
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73 const std::string& uri,
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 const std::string& body)
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 {
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 boost::mutex::scoped_lock lock(mutex_);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 client_.SetMethod(Orthanc::HttpMethod_Post);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 client_.SetUrl(url_ + uri);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 client_.SetBody(body);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 client_.ApplyAndThrowException(result);
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 }
2183
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
83
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
84
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
85 void OrthancHttpConnection::RestApiPut(std::string& result,
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
86 const std::string& uri,
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
87 const std::string& body)
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
88 {
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
89 boost::mutex::scoped_lock lock(mutex_);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
90
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
91 client_.SetMethod(Orthanc::HttpMethod_Put);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
92 client_.SetUrl(url_ + uri);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
93 client_.SetBody(body);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
94 client_.ApplyAndThrowException(result);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
95 }
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
96
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
97
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
98 void OrthancHttpConnection::RestApiDelete(const std::string& uri)
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
99 {
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
100 boost::mutex::scoped_lock lock(mutex_);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
101
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
102 std::string result;
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
103
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
104 client_.SetMethod(Orthanc::HttpMethod_Delete);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
105 client_.SetUrl(url_ + uri);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
106 client_.ApplyAndThrowException(result);
1d0838b8e9c5 RestApiDelete and RestApiPut
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2179
diff changeset
107 }
2179
de32f3b4ff09 shared toolbox to access DICOM datasets from plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
108 }