Mercurial > hg > orthanc
annotate OrthancServer/main.cpp @ 614:f27923072afd find-move-scp
merge
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 24 Oct 2013 10:33:11 +0200 |
parents | 60d90e48e809 b1a0990ad40c |
children | 5ab377df6d8b |
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 | |
229 | 33 #include "OrthancRestApi.h" |
0 | 34 |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
35 #include <fstream> |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
36 #include <glog/logging.h> |
112 | 37 #include <boost/algorithm/string/predicate.hpp> |
0 | 38 |
39 #include "../Core/HttpServer/EmbeddedResourceHttpHandler.h" | |
40 #include "../Core/HttpServer/FilesystemHttpHandler.h" | |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
41 #include "../Core/Lua/LuaFunctionCall.h" |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
42 #include "../Core/DicomFormat/DicomArray.h" |
0 | 43 #include "DicomProtocol/DicomServer.h" |
613 | 44 #include "DicomProtocol/DicomUserConnection.h" |
62 | 45 #include "OrthancInitialization.h" |
224
4eb0c7ce86c9
refactoring for store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
210
diff
changeset
|
46 #include "ServerContext.h" |
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
559
diff
changeset
|
47 #include "OrthancFindRequestHandler.h" |
0 | 48 |
62 | 49 using namespace Orthanc; |
0 | 50 |
51 | |
224
4eb0c7ce86c9
refactoring for store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
210
diff
changeset
|
52 |
613 | 53 class OrthancStoreRequestHandler : public IStoreRequestHandler |
0 | 54 { |
55 private: | |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
56 ServerContext& server_; |
0 | 57 |
58 public: | |
613 | 59 OrthancStoreRequestHandler(ServerContext& context) : |
388
466c992a9a42
testing filters inside orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
60 server_(context) |
0 | 61 { |
62 } | |
63 | |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
64 virtual void Handle(const std::string& dicomFile, |
0 | 65 const DicomMap& dicomSummary, |
66 const Json::Value& dicomJson, | |
34
96e57b863dd9
option to disallow remote access
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
67 const std::string& remoteAet) |
0 | 68 { |
69 if (dicomFile.size() > 0) | |
70 { | |
397
941ea46e9e26
lua filter of new instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
394
diff
changeset
|
71 server_.Store(&dicomFile[0], dicomFile.size(), dicomSummary, dicomJson, remoteAet); |
0 | 72 } |
73 } | |
74 }; | |
75 | |
76 | |
613 | 77 |
78 class OrthancMoveRequestIterator : public IMoveRequestIterator | |
79 { | |
80 private: | |
81 ServerContext& context_; | |
82 std::vector<std::string> instances_; | |
83 DicomUserConnection connection_; | |
84 size_t position_; | |
85 | |
86 public: | |
87 OrthancMoveRequestIterator(ServerContext& context, | |
88 const std::string& target, | |
89 const std::string& publicId) : | |
90 context_(context), | |
91 position_(0) | |
92 { | |
93 LOG(INFO) << "Sending resource " << publicId << " to modality \"" << target << "\""; | |
94 | |
95 std::list<std::string> tmp; | |
96 context_.GetIndex().GetChildInstances(tmp, publicId); | |
97 | |
98 instances_.reserve(tmp.size()); | |
99 for (std::list<std::string>::iterator it = tmp.begin(); it != tmp.end(); it++) | |
100 { | |
101 instances_.push_back(*it); | |
102 } | |
103 | |
104 ConnectToModalityUsingAETitle(connection_, target); | |
105 } | |
106 | |
107 virtual unsigned int GetSubOperationCount() const | |
108 { | |
109 return instances_.size(); | |
110 } | |
111 | |
112 virtual Status DoNext() | |
113 { | |
114 if (position_ >= instances_.size()) | |
115 { | |
116 return Status_Failure; | |
117 } | |
118 | |
119 const std::string& id = instances_[position_++]; | |
120 | |
121 std::string dicom; | |
122 context_.ReadFile(dicom, id, FileContentType_Dicom); | |
123 connection_.Store(dicom); | |
124 | |
125 return Status_Success; | |
126 } | |
127 }; | |
128 | |
129 | |
130 | |
131 class OrthancMoveRequestHandler : public IMoveRequestHandler | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
132 { |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
133 private: |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
134 ServerContext& context_; |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
135 |
613 | 136 bool LookupResource(std::string& publicId, |
137 DicomTag tag, | |
138 const DicomMap& input) | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
139 { |
613 | 140 if (!input.HasTag(tag)) |
141 { | |
142 return false; | |
143 } | |
144 | |
145 std::string value = input.GetValue(tag).AsString(); | |
146 | |
147 std::list<std::string> ids; | |
148 context_.GetIndex().LookupTagValue(ids, tag, value); | |
149 | |
150 if (ids.size() != 1) | |
151 { | |
152 return false; | |
153 } | |
154 else | |
155 { | |
156 publicId = ids.front(); | |
157 return true; | |
158 } | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
159 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
160 |
0 | 161 public: |
613 | 162 OrthancMoveRequestHandler(ServerContext& context) : |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
163 context_(context) |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
164 { |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
165 } |
0 | 166 |
167 public: | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
168 virtual IMoveRequestIterator* Handle(const std::string& target, |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
169 const DicomMap& input) |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
170 { |
613 | 171 LOG(WARNING) << "Move-SCU request received for AET \"" << target << "\""; |
172 | |
173 | |
174 /** | |
175 * Retrieve the query level. | |
176 **/ | |
177 | |
178 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL); | |
179 if (levelTmp == NULL) | |
180 { | |
181 throw OrthancException(ErrorCode_BadRequest); | |
182 } | |
183 | |
184 ResourceType level = StringToResourceType(levelTmp->AsString().c_str()); | |
185 | |
186 | |
187 /** | |
188 * Lookup for the resource to be sent. | |
189 **/ | |
190 | |
191 bool ok; | |
192 std::string publicId; | |
193 | |
194 switch (level) | |
195 { | |
196 case ResourceType_Patient: | |
197 ok = LookupResource(publicId, DICOM_TAG_PATIENT_ID, input); | |
198 break; | |
199 | |
200 case ResourceType_Study: | |
201 ok = LookupResource(publicId, DICOM_TAG_STUDY_INSTANCE_UID, input); | |
202 break; | |
203 | |
204 case ResourceType_Series: | |
205 ok = LookupResource(publicId, DICOM_TAG_SERIES_INSTANCE_UID, input); | |
206 break; | |
207 | |
208 case ResourceType_Instance: | |
209 ok = LookupResource(publicId, DICOM_TAG_SOP_INSTANCE_UID, input); | |
210 break; | |
211 | |
212 default: | |
213 ok = false; | |
214 } | |
215 | |
216 if (!ok) | |
217 { | |
218 throw OrthancException(ErrorCode_BadRequest); | |
219 } | |
220 | |
221 return new OrthancMoveRequestIterator(context_, target, publicId); | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
222 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
223 }; |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
224 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
225 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
226 class MyDicomServerFactory : |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
227 public IStoreRequestHandlerFactory, |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
228 public IFindRequestHandlerFactory, |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
229 public IMoveRequestHandlerFactory |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
230 { |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
231 private: |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
232 ServerContext& context_; |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
233 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
234 public: |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
235 MyDicomServerFactory(ServerContext& context) : context_(context) |
0 | 236 { |
237 } | |
238 | |
239 virtual IStoreRequestHandler* ConstructStoreRequestHandler() | |
240 { | |
613 | 241 return new OrthancStoreRequestHandler(context_); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
242 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
243 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
244 virtual IFindRequestHandler* ConstructFindRequestHandler() |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
245 { |
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
559
diff
changeset
|
246 return new OrthancFindRequestHandler(context_); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
247 } |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
248 |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
249 virtual IMoveRequestHandler* ConstructMoveRequestHandler() |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
250 { |
613 | 251 return new OrthancMoveRequestHandler(context_); |
0 | 252 } |
253 | |
254 void Done() | |
255 { | |
256 } | |
257 }; | |
258 | |
259 | |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
260 class MyIncomingHttpRequestFilter : public IIncomingHttpRequestFilter |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
261 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
262 private: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
263 ServerContext& context_; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
264 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
265 public: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
266 MyIncomingHttpRequestFilter(ServerContext& context) : context_(context) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
267 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
268 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
269 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
270 virtual bool IsAllowed(HttpMethod method, |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
271 const char* uri, |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
272 const char* ip, |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
273 const char* username) const |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
274 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
275 static const char* HTTP_FILTER = "IncomingHttpRequestFilter"; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
276 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
277 // Test if the instance must be filtered out |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
278 if (context_.GetLuaContext().IsExistingFunction(HTTP_FILTER)) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
279 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
280 LuaFunctionCall call(context_.GetLuaContext(), HTTP_FILTER); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
281 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
282 switch (method) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
283 { |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
284 case HttpMethod_Get: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
285 call.PushString("GET"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
286 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
287 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
288 case HttpMethod_Put: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
289 call.PushString("PUT"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
290 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
291 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
292 case HttpMethod_Post: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
293 call.PushString("POST"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
294 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
295 |
473
c9a5d72f8481
changing the namespace of HTTP enumerations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
296 case HttpMethod_Delete: |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
297 call.PushString("DELETE"); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
298 break; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
299 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
300 default: |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
301 return true; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
302 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
303 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
304 call.PushString(uri); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
305 call.PushString(ip); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
306 call.PushString(username); |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
307 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
308 if (!call.ExecutePredicate()) |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
309 { |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
310 LOG(INFO) << "An incoming HTTP request has been discarded by the filter"; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
311 return false; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
312 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
313 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
314 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
315 return true; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
316 } |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
317 }; |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
318 |
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
319 |
133 | 320 void PrintHelp(char* path) |
321 { | |
322 std::cout | |
323 << "Usage: " << path << " [OPTION]... [CONFIGURATION]" << std::endl | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
324 << "Orthanc, lightweight, RESTful DICOM server for healthcare and medical research." << std::endl |
133 | 325 << std::endl |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
326 << "If no configuration file is given on the command line, a set of default " << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
327 << "parameters is used. Please refer to the Orthanc homepage for the full " << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
328 << "instructions about how to use Orthanc " << std::endl |
133 | 329 << "<https://code.google.com/p/orthanc/wiki/OrthancCookbook>." << std::endl |
330 << std::endl | |
331 << "Command-line options:" << std::endl | |
332 << " --help\t\tdisplay this help and exit" << std::endl | |
333 << " --logdir=[dir]\tdirectory where to store the log files" << std::endl | |
334 << "\t\t\t(if not used, the logs are dumped to stderr)" << std::endl | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
335 << " --config=[file]\tcreate a sample configuration file and exit" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
336 << " --trace\t\thighest verbosity in logs (for debug)" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
337 << " --verbose\t\tbe verbose in logs" << std::endl |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
338 << " --version\t\toutput version information and exit" << std::endl |
133 | 339 << std::endl |
340 << "Exit status:" << std::endl | |
341 << " 0 if OK," << std::endl | |
342 << " -1 if error (have a look at the logs)." << std::endl | |
343 << std::endl; | |
344 } | |
0 | 345 |
346 | |
133 | 347 void PrintVersion(char* path) |
348 { | |
349 std::cout | |
350 << path << " " << ORTHANC_VERSION << std::endl | |
363 | 351 << "Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege (Belgium) " << std::endl |
133 | 352 << "Licensing GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>, with OpenSSL exception." << std::endl |
353 << "This is free software: you are free to change and redistribute it." << std::endl | |
354 << "There is NO WARRANTY, to the extent permitted by law." << std::endl | |
355 << std::endl | |
356 << "Written by Sebastien Jodogne <s.jodogne@gmail.com>" << std::endl; | |
357 } | |
358 | |
0 | 359 |
360 int main(int argc, char* argv[]) | |
361 { | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
362 // Initialize Google's logging library. |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
363 FLAGS_logtostderr = true; |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
364 FLAGS_minloglevel = 1; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
365 FLAGS_v = 0; |
133 | 366 |
112 | 367 for (int i = 1; i < argc; i++) |
368 { | |
133 | 369 if (std::string(argv[i]) == "--help") |
370 { | |
371 PrintHelp(argv[0]); | |
372 return 0; | |
373 } | |
374 | |
375 if (std::string(argv[i]) == "--version") | |
376 { | |
377 PrintVersion(argv[0]); | |
378 return 0; | |
379 } | |
380 | |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
381 if (std::string(argv[i]) == "--verbose") |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
382 { |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
383 FLAGS_minloglevel = 0; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
384 } |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
385 |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
386 if (std::string(argv[i]) == "--trace") |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
387 { |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
388 FLAGS_minloglevel = 0; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
389 FLAGS_v = 1; |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
390 } |
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
391 |
112 | 392 if (boost::starts_with(argv[i], "--logdir=")) |
393 { | |
394 FLAGS_logtostderr = false; | |
395 FLAGS_log_dir = std::string(argv[i]).substr(9); | |
396 } | |
175
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
397 |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
398 if (boost::starts_with(argv[i], "--config=")) |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
399 { |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
400 std::string configurationSample; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
401 GetFileResource(configurationSample, EmbeddedResources::CONFIGURATION_SAMPLE); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
402 |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
403 std::string target = std::string(argv[i]).substr(9); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
404 std::ofstream f(target.c_str()); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
405 f << configurationSample; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
406 f.close(); |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
407 return 0; |
662af781a227
sample config file from command line
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
158
diff
changeset
|
408 } |
112 | 409 } |
410 | |
102
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
411 google::InitGoogleLogging("Orthanc"); |
7593b57dc1bf
switch to google log
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
412 |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
413 int status = 0; |
0 | 414 try |
415 { | |
112 | 416 bool isInitialized = false; |
26 | 417 if (argc >= 2) |
418 { | |
112 | 419 for (int i = 1; i < argc; i++) |
420 { | |
421 // Use the first argument that does not start with a "-" as | |
422 // the configuration file | |
423 if (argv[i][0] != '-') | |
424 { | |
425 OrthancInitialize(argv[i]); | |
426 isInitialized = true; | |
427 } | |
428 } | |
26 | 429 } |
112 | 430 |
431 if (!isInitialized) | |
26 | 432 { |
62 | 433 OrthancInitialize(); |
26 | 434 } |
435 | |
426 | 436 std::string storageDirectoryStr = GetGlobalStringParameter("StorageDirectory", "OrthancStorage"); |
437 boost::filesystem::path storageDirectory = InterpretStringParameterAsPath(storageDirectoryStr); | |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
438 boost::filesystem::path indexDirectory = |
426 | 439 InterpretStringParameterAsPath(GetGlobalStringParameter("IndexDirectory", storageDirectoryStr)); |
376
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
440 ServerContext context(storageDirectory, indexDirectory); |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
441 |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
442 LOG(WARNING) << "Storage directory: " << storageDirectory; |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
443 LOG(WARNING) << "Index directory: " << indexDirectory; |
2cef9c2d4148
separate path for SQLite index, manual loading of external dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
363
diff
changeset
|
444 |
236 | 445 context.SetCompressionEnabled(GetGlobalBoolParameter("StorageCompression", false)); |
446 | |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
447 std::list<std::string> luaScripts; |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
448 GetGlobalListOfStringsParameter(luaScripts, "LuaScripts"); |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
449 for (std::list<std::string>::const_iterator |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
450 it = luaScripts.begin(); it != luaScripts.end(); it++) |
392
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
451 { |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
452 std::string path = InterpretStringParameterAsPath(*it); |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
453 LOG(WARNING) << "Installing the Lua scripts from: " << path; |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
454 std::string script; |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
455 Toolbox::ReadFile(script, path); |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
456 context.GetLuaContext().Execute(script); |
392
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
457 } |
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
458 |
7035f4a5b07b
installing lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
388
diff
changeset
|
459 |
270
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
460 try |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
461 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
462 context.GetIndex().SetMaximumPatientCount(GetGlobalIntegerParameter("MaximumPatientCount", 0)); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
463 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
464 catch (...) |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
465 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
466 context.GetIndex().SetMaximumPatientCount(0); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
467 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
468 |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
469 try |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
470 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
471 uint64_t size = GetGlobalIntegerParameter("MaximumStorageSize", 0); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
472 context.GetIndex().SetMaximumStorageSize(size * 1024 * 1024); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
473 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
474 catch (...) |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
475 { |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
476 context.GetIndex().SetMaximumStorageSize(0); |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
477 } |
e6a4c4329481
parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
236
diff
changeset
|
478 |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
479 MyDicomServerFactory serverFactory(context); |
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
480 |
0 | 481 { |
482 // DICOM server | |
483 DicomServer dicomServer; | |
55 | 484 dicomServer.SetCalledApplicationEntityTitleCheck(GetGlobalBoolParameter("DicomCheckCalledAet", false)); |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
485 dicomServer.SetStoreRequestHandlerFactory(serverFactory); |
559 | 486 dicomServer.SetMoveRequestHandlerFactory(serverFactory); |
487 dicomServer.SetFindRequestHandlerFactory(serverFactory); | |
128 | 488 dicomServer.SetPortNumber(GetGlobalIntegerParameter("DicomPort", 4242)); |
62 | 489 dicomServer.SetApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); |
0 | 490 |
491 // HTTP server | |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
492 MyIncomingHttpRequestFilter httpFilter(context); |
0 | 493 MongooseServer httpServer; |
158 | 494 httpServer.SetPortNumber(GetGlobalIntegerParameter("HttpPort", 8042)); |
34
96e57b863dd9
option to disallow remote access
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
495 httpServer.SetRemoteAccessAllowed(GetGlobalBoolParameter("RemoteAccessAllowed", false)); |
409
63f707278fc8
lua filtering of incoming http requests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
407
diff
changeset
|
496 httpServer.SetIncomingHttpRequestFilter(httpFilter); |
0 | 497 |
607 | 498 httpServer.SetAuthenticationEnabled(GetGlobalBoolParameter("AuthenticationEnabled", false)); |
25
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
499 SetupRegisteredUsers(httpServer); |
dd1489098265
basic http authentication
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
23
diff
changeset
|
500 |
23 | 501 if (GetGlobalBoolParameter("SslEnabled", false)) |
502 { | |
394
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
503 std::string certificate = |
9784f19f7e1b
path relative to configuration path, list of lua scripts
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
392
diff
changeset
|
504 InterpretStringParameterAsPath(GetGlobalStringParameter("SslCertificate", "certificate.pem")); |
23 | 505 httpServer.SetSslEnabled(true); |
506 httpServer.SetSslCertificate(certificate.c_str()); | |
507 } | |
508 else | |
509 { | |
510 httpServer.SetSslEnabled(false); | |
511 } | |
512 | |
178 | 513 LOG(WARNING) << "DICOM server listening on port: " << dicomServer.GetPortNumber(); |
514 LOG(WARNING) << "HTTP server listening on port: " << httpServer.GetPortNumber(); | |
125 | 515 |
62 | 516 #if ORTHANC_STANDALONE == 1 |
517 httpServer.RegisterHandler(new EmbeddedResourceHttpHandler("/app", EmbeddedResources::ORTHANC_EXPLORER)); | |
0 | 518 #else |
62 | 519 httpServer.RegisterHandler(new FilesystemHttpHandler("/app", ORTHANC_PATH "/OrthancExplorer")); |
0 | 520 #endif |
521 | |
229 | 522 httpServer.RegisterHandler(new OrthancRestApi(context)); |
0 | 523 |
524 // GO !!! | |
525 httpServer.Start(); | |
526 dicomServer.Start(); | |
527 | |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
528 LOG(WARNING) << "Orthanc has started"; |
0 | 529 Toolbox::ServerBarrier(); |
530 | |
531 // Stop | |
137
0e97abc7b950
fix of a bug in older versions of sqlite
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
136
diff
changeset
|
532 LOG(WARNING) << "Orthanc is stopping"; |
0 | 533 } |
534 | |
387
ff647eedfbe1
enabling of Find/Move commands
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
376
diff
changeset
|
535 serverFactory.Done(); |
0 | 536 } |
62 | 537 catch (OrthancException& e) |
0 | 538 { |
108 | 539 LOG(ERROR) << "EXCEPTION [" << e.What() << "]"; |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
540 status = -1; |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
541 } |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
542 catch (...) |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
543 { |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
544 LOG(ERROR) << "NATIVE EXCEPTION"; |
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
545 status = -1; |
0 | 546 } |
547 | |
62 | 548 OrthancFinalize(); |
27 | 549 |
291
4d7469f72a0b
embedding of dicom dictionaries
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
270
diff
changeset
|
550 return status; |
0 | 551 } |