Mercurial > hg > orthanc
annotate OrthancServer/OrthancInitialization.cpp @ 660:f0232774b913
fix warnings
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 04 Nov 2013 15:07:58 +0100 |
| parents | 5425bb6f1ea5 |
| children | b01cc78caba4 |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 62 | 2 * Orthanc - A Lightweight, RESTful DICOM Store |
| 399 | 3 * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege, |
| 0 | 4 * Belgium |
| 5 * | |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 136 | 10 * |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 0 | 22 * |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
| 62 | 33 #include "OrthancInitialization.h" |
| 0 | 34 |
| 476 | 35 #include "../Core/HttpClient.h" |
| 62 | 36 #include "../Core/OrthancException.h" |
| 0 | 37 #include "../Core/Toolbox.h" |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
38 #include "ServerEnumerations.h" |
| 0 | 39 |
| 40 #include <boost/lexical_cast.hpp> | |
| 41 #include <boost/filesystem.hpp> | |
| 42 #include <curl/curl.h> | |
| 43 #include <boost/thread.hpp> | |
| 108 | 44 #include <glog/logging.h> |
| 0 | 45 |
| 62 | 46 namespace Orthanc |
| 0 | 47 { |
| 48 static boost::mutex globalMutex_; | |
| 49 static std::auto_ptr<Json::Value> configuration_; | |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
50 static boost::filesystem::path defaultDirectory_; |
| 0 | 51 |
| 52 static void ReadGlobalConfiguration(const char* configurationFile) | |
| 53 { | |
| 54 configuration_.reset(new Json::Value); | |
| 55 | |
| 56 std::string content; | |
| 57 | |
| 58 if (configurationFile) | |
| 59 { | |
| 60 Toolbox::ReadFile(content, configurationFile); | |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
61 defaultDirectory_ = boost::filesystem::path(configurationFile).parent_path(); |
| 660 | 62 LOG(WARNING) << "Using the configuration from: " << configurationFile; |
| 0 | 63 } |
| 64 else | |
| 65 { | |
| 660 | 66 #if ORTHANC_STANDALONE == 1 |
| 67 // No default path for the standalone configuration | |
| 68 LOG(WARNING) << "Using the default Orthanc configuration"; | |
| 69 return; | |
| 70 | |
| 71 #else | |
| 72 // In a non-standalone build, we use the | |
| 73 // "Resources/Configuration.json" from the Orthanc source code | |
| 74 | |
| 19 | 75 try |
| 76 { | |
| 660 | 77 boost::filesystem::path p = ORTHANC_PATH; |
| 78 p /= "Resources"; | |
| 79 p /= "Configuration.json"; | |
|
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
80 Toolbox::ReadFile(content, p.string()); |
| 660 | 81 LOG(WARNING) << "Using the configuration from: " << p.string(); |
|
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
82 } |
|
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
83 catch (OrthancException&) |
|
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
84 { |
|
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
85 // No configuration file found, give up with empty configuration |
| 660 | 86 LOG(WARNING) << "Using the default Orthanc configuration"; |
| 19 | 87 return; |
| 88 } | |
|
87
8517e2c44283
path to configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
89 #endif |
| 0 | 90 } |
| 91 | |
| 92 Json::Reader reader; | |
| 93 if (!reader.parse(content, *configuration_)) | |
| 94 { | |
| 62 | 95 throw OrthancException("Unable to read the configuration file"); |
| 0 | 96 } |
| 97 } | |
| 98 | |
| 99 | |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
100 static void RegisterUserMetadata() |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
101 { |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
102 if (configuration_->isMember("UserMetadata")) |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
103 { |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
104 const Json::Value& parameter = (*configuration_) ["UserMetadata"]; |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
105 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
106 Json::Value::Members members = parameter.getMemberNames(); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
107 for (size_t i = 0; i < members.size(); i++) |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
108 { |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
109 std::string info = "\"" + members[i] + "\" = " + parameter[members[i]].toStyledString(); |
| 660 | 110 LOG(WARNING) << "Registering user-defined metadata: " << info; |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
111 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
112 if (!parameter[members[i]].asBool()) |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
113 { |
| 439 | 114 LOG(ERROR) << "Not a number in this user-defined metadata: " << info; |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
115 throw OrthancException(ErrorCode_BadParameterType); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
116 } |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
117 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
118 int metadata = parameter[members[i]].asInt(); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
119 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
120 try |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
121 { |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
122 RegisterUserMetadata(metadata, members[i]); |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
123 } |
|
657
5425bb6f1ea5
further cppcheck fixes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
124 catch (OrthancException&) |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
125 { |
| 439 | 126 LOG(ERROR) << "Cannot register this user-defined metadata: " << info; |
|
657
5425bb6f1ea5
further cppcheck fixes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
656
diff
changeset
|
127 throw; |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
128 } |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
129 } |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
130 } |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
131 } |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
132 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
133 |
| 62 | 134 void OrthancInitialize(const char* configurationFile) |
| 0 | 135 { |
| 136 boost::mutex::scoped_lock lock(globalMutex_); | |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
137 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
138 InitializeServerEnumerations(); |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
139 defaultDirectory_ = boost::filesystem::current_path(); |
| 0 | 140 ReadGlobalConfiguration(configurationFile); |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
141 |
| 457 | 142 HttpClient::GlobalInitialize(); |
|
435
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
143 |
|
28ba73274919
registration of user-defined metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
430
diff
changeset
|
144 RegisterUserMetadata(); |
| 0 | 145 } |
| 146 | |
| 147 | |
| 148 | |
| 62 | 149 void OrthancFinalize() |
| 0 | 150 { |
| 151 boost::mutex::scoped_lock lock(globalMutex_); | |
| 457 | 152 HttpClient::GlobalFinalize(); |
| 0 | 153 configuration_.reset(NULL); |
| 154 } | |
| 155 | |
| 156 | |
| 157 | |
| 158 std::string GetGlobalStringParameter(const std::string& parameter, | |
| 159 const std::string& defaultValue) | |
| 160 { | |
| 161 boost::mutex::scoped_lock lock(globalMutex_); | |
| 162 | |
| 163 if (configuration_->isMember(parameter)) | |
| 164 { | |
| 165 return (*configuration_) [parameter].asString(); | |
| 166 } | |
| 167 else | |
| 168 { | |
| 169 return defaultValue; | |
| 170 } | |
| 171 } | |
| 172 | |
| 173 | |
| 174 int GetGlobalIntegerParameter(const std::string& parameter, | |
| 175 int defaultValue) | |
| 176 { | |
| 177 boost::mutex::scoped_lock lock(globalMutex_); | |
| 178 | |
| 179 if (configuration_->isMember(parameter)) | |
| 180 { | |
| 181 return (*configuration_) [parameter].asInt(); | |
| 182 } | |
| 183 else | |
| 184 { | |
| 185 return defaultValue; | |
| 186 } | |
| 187 } | |
| 188 | |
| 23 | 189 bool GetGlobalBoolParameter(const std::string& parameter, |
| 190 bool defaultValue) | |
| 191 { | |
| 192 boost::mutex::scoped_lock lock(globalMutex_); | |
| 193 | |
| 194 if (configuration_->isMember(parameter)) | |
| 195 { | |
| 196 return (*configuration_) [parameter].asBool(); | |
| 197 } | |
| 198 else | |
| 199 { | |
| 200 return defaultValue; | |
| 201 } | |
| 202 } | |
| 203 | |
| 204 | |
| 0 | 205 |
| 206 | |
| 617 | 207 void GetDicomModalityUsingSymbolicName(const std::string& name, |
| 208 std::string& aet, | |
| 209 std::string& address, | |
| 210 int& port, | |
| 211 ModalityManufacturer& manufacturer) | |
| 0 | 212 { |
| 213 boost::mutex::scoped_lock lock(globalMutex_); | |
| 214 | |
| 215 if (!configuration_->isMember("DicomModalities")) | |
| 216 { | |
| 62 | 217 throw OrthancException(""); |
| 0 | 218 } |
| 219 | |
| 220 const Json::Value& modalities = (*configuration_) ["DicomModalities"]; | |
| 221 if (modalities.type() != Json::objectValue || | |
|
519
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
222 !modalities.isMember(name) || |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
223 (modalities[name].size() != 3 && modalities[name].size() != 4)) |
| 0 | 224 { |
| 62 | 225 throw OrthancException(""); |
| 0 | 226 } |
| 227 | |
| 228 try | |
| 229 { | |
| 230 aet = modalities[name].get(0u, "").asString(); | |
| 231 address = modalities[name].get(1u, "").asString(); | |
| 232 port = modalities[name].get(2u, "").asInt(); | |
|
519
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
233 |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
234 if (modalities[name].size() == 4) |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
235 { |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
236 manufacturer = StringToModalityManufacturer(modalities[name].get(3u, "").asString()); |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
237 } |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
238 else |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
239 { |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
240 manufacturer = ModalityManufacturer_Generic; |
|
1b2cdc855bd3
Parameter for PACS manufacturer, support for ClearCanvas
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
485
diff
changeset
|
241 } |
| 0 | 242 } |
| 243 catch (...) | |
| 244 { | |
| 62 | 245 throw OrthancException("Badly formatted DICOM modality"); |
| 0 | 246 } |
| 247 } | |
| 248 | |
| 249 | |
| 250 | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
251 void GetOrthancPeer(const std::string& name, |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
252 std::string& url, |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
253 std::string& username, |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
254 std::string& password) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
255 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
256 boost::mutex::scoped_lock lock(globalMutex_); |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
257 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
258 if (!configuration_->isMember("OrthancPeers")) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
259 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
260 throw OrthancException(""); |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
261 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
262 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
263 const Json::Value& modalities = (*configuration_) ["OrthancPeers"]; |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
264 if (modalities.type() != Json::objectValue || |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
265 !modalities.isMember(name)) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
266 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
267 throw OrthancException(""); |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
268 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
269 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
270 try |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
271 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
272 url = modalities[name].get(0u, "").asString(); |
|
485
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
273 |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
274 if (modalities[name].size() == 1) |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
275 { |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
276 username = ""; |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
277 password = ""; |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
278 } |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
279 else if (modalities[name].size() == 3) |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
280 { |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
281 username = modalities[name].get(1u, "").asString(); |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
282 password = modalities[name].get(2u, "").asString(); |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
283 } |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
284 else |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
285 { |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
286 throw OrthancException(ErrorCode_BadFileFormat); |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
287 } |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
288 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
289 catch (...) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
290 { |
|
485
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
291 throw OrthancException(ErrorCode_BadFileFormat); |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
292 } |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
293 |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
294 if (url.size() != 0 && url[url.size() - 1] != '/') |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
295 { |
|
bdbde1fbfab3
send resources through HTTP
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
484
diff
changeset
|
296 url += '/'; |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
297 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
298 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
299 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
300 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
301 static bool ReadKeys(std::set<std::string>& target, |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
302 const char* parameter, |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
303 bool onlyAlphanumeric) |
| 0 | 304 { |
| 305 boost::mutex::scoped_lock lock(globalMutex_); | |
| 306 | |
| 307 target.clear(); | |
| 308 | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
309 if (!configuration_->isMember(parameter)) |
| 0 | 310 { |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
311 return true; |
| 0 | 312 } |
| 313 | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
314 const Json::Value& modalities = (*configuration_) [parameter]; |
| 0 | 315 if (modalities.type() != Json::objectValue) |
| 316 { | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
317 throw OrthancException(ErrorCode_BadFileFormat); |
| 0 | 318 } |
| 319 | |
| 320 Json::Value::Members members = modalities.getMemberNames(); | |
| 321 for (size_t i = 0; i < members.size(); i++) | |
| 322 { | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
323 if (onlyAlphanumeric) |
| 0 | 324 { |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
325 for (size_t j = 0; j < members[i].size(); j++) |
| 0 | 326 { |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
327 if (!isalnum(members[i][j]) && members[i][j] != '-') |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
328 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
329 return false; |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
330 } |
| 0 | 331 } |
| 332 } | |
| 333 | |
| 334 target.insert(members[i]); | |
| 335 } | |
|
484
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
336 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
337 return true; |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
338 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
339 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
340 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
341 void GetListOfDicomModalities(std::set<std::string>& target) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
342 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
343 if (!ReadKeys(target, "DicomModalities", true)) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
344 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
345 throw OrthancException("Only alphanumeric and dash characters are allowed in the names of the modalities"); |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
346 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
347 } |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
348 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
349 |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
350 void GetListOfOrthancPeers(std::set<std::string>& target) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
351 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
352 if (!ReadKeys(target, "OrthancPeers", true)) |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
353 { |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
354 throw OrthancException("Only alphanumeric and dash characters are allowed in the names of Orthanc peers"); |
|
b8ace6fc1d1f
preparation for handling Orthanc peers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
476
diff
changeset
|
355 } |
| 0 | 356 } |
|
25
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
357 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
358 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
359 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
360 void SetupRegisteredUsers(MongooseServer& httpServer) |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
361 { |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
362 boost::mutex::scoped_lock lock(globalMutex_); |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
363 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
364 httpServer.ClearUsers(); |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
365 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
366 if (!configuration_->isMember("RegisteredUsers")) |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
367 { |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
368 return; |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
369 } |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
370 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
371 const Json::Value& users = (*configuration_) ["RegisteredUsers"]; |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
372 if (users.type() != Json::objectValue) |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
373 { |
| 62 | 374 throw OrthancException("Badly formatted list of users"); |
|
25
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
375 } |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
376 |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
377 Json::Value::Members usernames = users.getMemberNames(); |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
378 for (size_t i = 0; i < usernames.size(); i++) |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
379 { |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
380 const std::string& username = usernames[i]; |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
381 std::string password = users[username].asString(); |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
382 httpServer.RegisterUser(username.c_str(), password.c_str()); |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
383 } |
|
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
384 } |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
385 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
386 |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
387 std::string InterpretRelativePath(const std::string& baseDirectory, |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
388 const std::string& relativePath) |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
389 { |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
390 boost::filesystem::path base(baseDirectory); |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
391 boost::filesystem::path relative(relativePath); |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
392 |
| 428 | 393 /** |
| 394 The following lines should be equivalent to this one: | |
| 395 | |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
396 return (base / relative).string(); |
| 428 | 397 |
| 398 However, for some unknown reason, some versions of Boost do not | |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
399 make the proper path resolution when "baseDirectory" is an |
| 428 | 400 absolute path. So, a hack is used below. |
| 401 **/ | |
| 402 | |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
403 if (relative.is_absolute()) |
| 427 | 404 { |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
405 return relative.string(); |
| 427 | 406 } |
| 407 else | |
| 408 { | |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
409 return (base / relative).string(); |
| 427 | 410 } |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
411 } |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
412 |
|
429
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
413 std::string InterpretStringParameterAsPath(const std::string& parameter) |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
414 { |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
415 boost::mutex::scoped_lock lock(globalMutex_); |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
416 return InterpretRelativePath(defaultDirectory_.string(), parameter); |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
417 } |
|
09b3c6265a94
unit test for fedora 18 problem
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
428
diff
changeset
|
418 |
|
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
419 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
420 void GetGlobalListOfStringsParameter(std::list<std::string>& target, |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
421 const std::string& key) |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
422 { |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
423 boost::mutex::scoped_lock lock(globalMutex_); |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
424 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
425 target.clear(); |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
426 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
427 if (!configuration_->isMember(key)) |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
428 { |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
429 return; |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
430 } |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
431 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
432 const Json::Value& lst = (*configuration_) [key]; |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
433 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
434 if (lst.type() != Json::arrayValue) |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
435 { |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
436 throw OrthancException("Badly formatted list of strings"); |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
437 } |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
438 |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
439 for (Json::Value::ArrayIndex i = 0; i < lst.size(); i++) |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
440 { |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
441 target.push_back(lst[i].asString()); |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
442 } |
|
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
443 } |
| 613 | 444 |
| 445 | |
| 446 void ConnectToModalityUsingSymbolicName(DicomUserConnection& connection, | |
| 447 const std::string& name) | |
| 448 { | |
| 449 std::string aet, address; | |
| 450 int port; | |
| 451 ModalityManufacturer manufacturer; | |
| 617 | 452 GetDicomModalityUsingSymbolicName(name, aet, address, port, manufacturer); |
| 613 | 453 |
| 454 LOG(WARNING) << "Connecting to remote DICOM modality: AET=" << aet << ", address=" << address << ", port=" << port; | |
| 455 | |
| 456 connection.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); | |
| 457 connection.SetDistantApplicationEntityTitle(aet); | |
| 458 connection.SetDistantHost(address); | |
| 459 connection.SetDistantPort(port); | |
| 460 connection.SetDistantManufacturer(manufacturer); | |
| 461 connection.Open(); | |
| 462 } | |
| 463 | |
| 464 | |
| 617 | 465 bool LookupDicomModalityUsingAETitle(const std::string& aet, |
| 466 std::string& symbolicName, | |
| 467 std::string& address, | |
| 468 int& port, | |
| 469 ModalityManufacturer& manufacturer) | |
| 613 | 470 { |
| 471 std::set<std::string> modalities; | |
| 472 GetListOfDicomModalities(modalities); | |
| 473 | |
| 474 for (std::set<std::string>::const_iterator | |
| 656 | 475 it = modalities.begin(); it != modalities.end(); ++it) |
| 613 | 476 { |
| 477 try | |
| 478 { | |
| 479 std::string thisAet; | |
| 617 | 480 GetDicomModalityUsingSymbolicName(*it, thisAet, address, port, manufacturer); |
| 613 | 481 |
| 482 if (aet == thisAet) | |
| 483 { | |
| 617 | 484 return true; |
| 613 | 485 } |
| 486 } | |
| 487 catch (OrthancException&) | |
| 488 { | |
| 489 } | |
| 490 } | |
| 491 | |
| 617 | 492 return false; |
| 493 } | |
| 494 | |
| 495 | |
| 496 bool IsKnownAETitle(const std::string& aet) | |
| 497 { | |
| 498 std::string symbolicName, address; | |
| 499 int port; | |
| 500 ModalityManufacturer manufacturer; | |
| 501 | |
| 502 return LookupDicomModalityUsingAETitle(aet, symbolicName, address, port, manufacturer); | |
| 503 } | |
| 504 | |
| 505 | |
| 506 void ConnectToModalityUsingAETitle(DicomUserConnection& connection, | |
| 507 const std::string& aet) | |
| 508 { | |
| 509 std::string symbolicName, address; | |
| 510 int port; | |
| 511 ModalityManufacturer manufacturer; | |
| 512 | |
| 513 if (!LookupDicomModalityUsingAETitle(aet, symbolicName, address, port, manufacturer)) | |
| 613 | 514 { |
| 515 throw OrthancException("Unknown modality: " + aet); | |
| 516 } | |
| 517 | |
| 518 LOG(WARNING) << "Connecting to remote DICOM modality: AET=" << aet << ", address=" << address << ", port=" << port; | |
| 519 | |
| 520 connection.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); | |
| 521 connection.SetDistantApplicationEntityTitle(aet); | |
| 522 connection.SetDistantHost(address); | |
| 523 connection.SetDistantPort(port); | |
| 524 connection.SetDistantManufacturer(manufacturer); | |
| 525 connection.Open(); | |
| 526 } | |
| 0 | 527 } |