Mercurial > hg > orthanc
annotate OrthancServer/Scheduler/ServerJob.cpp @ 2445:6e5bc5c6d1a4
Fix to allow creating DICOM instances with empty Specific Character Set (0008,0005)
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 14 Dec 2017 13:02:06 +0100 |
| parents | a3a65de1840f |
| children | 878b59270859 |
| rev | line source |
|---|---|
| 781 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1009
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
|
2244
a3a65de1840f
shared copyright with osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2172
diff
changeset
|
5 * Copyright (C) 2017 Osimis, Belgium |
| 781 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU General Public License as | |
| 9 * published by the Free Software Foundation, either version 3 of the | |
| 10 * License, or (at your option) any later version. | |
| 11 * | |
| 12 * In addition, as a special exception, the copyright holders of this | |
| 13 * program give permission to link the code of its release with the | |
| 14 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 15 * that use the same license as the "OpenSSL" library), and distribute | |
| 16 * the linked executables. You must obey the GNU General Public License | |
| 17 * in all respects for all of the code used other than "OpenSSL". If you | |
| 18 * modify file(s) with this exception, you may extend this exception to | |
| 19 * your version of the file(s), but you are not obligated to do so. If | |
| 20 * you do not wish to do so, delete this exception statement from your | |
| 21 * version. If you delete this exception statement from all source files | |
| 22 * in the program, then also delete it here. | |
| 23 * | |
| 24 * This program is distributed in the hope that it will be useful, but | |
| 25 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 27 * General Public License for more details. | |
| 28 * | |
| 29 * You should have received a copy of the GNU General Public License | |
| 30 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 31 **/ | |
| 32 | |
| 33 | |
|
1624
0a2ad4a6858f
fix missing precompiled headers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1582
diff
changeset
|
34 #include "../PrecompiledHeadersServer.h" |
| 781 | 35 #include "ServerJob.h" |
| 36 | |
| 37 #include "../../Core/OrthancException.h" | |
|
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
38 #include "../../Core/SystemToolbox.h" |
| 781 | 39 #include "../../Core/Toolbox.h" |
| 40 | |
| 41 namespace Orthanc | |
| 42 { | |
| 43 void ServerJob::CheckOrdering() | |
| 44 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
45 std::map<ServerCommandInstance*, unsigned int> index; |
| 781 | 46 |
| 47 unsigned int count = 0; | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
48 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 49 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 50 { |
| 51 index[*it] = count++; | |
| 52 } | |
| 53 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
54 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 55 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 56 { |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
57 const std::list<ServerCommandInstance*>& nextCommands = (*it)->GetNextCommands(); |
| 781 | 58 |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
59 for (std::list<ServerCommandInstance*>::const_iterator |
| 1304 | 60 next = nextCommands.begin(); next != nextCommands.end(); ++next) |
| 781 | 61 { |
| 62 if (index.find(*next) == index.end() || | |
| 63 index[*next] <= index[*it]) | |
| 64 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
65 // You must reorder your calls to "ServerJob::AddCommand" |
|
1582
bd1889029cbb
encoding of exceptions
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1304
diff
changeset
|
66 throw OrthancException(ErrorCode_BadJobOrdering); |
| 781 | 67 } |
| 68 } | |
| 69 } | |
| 70 } | |
| 71 | |
| 72 | |
| 73 size_t ServerJob::Submit(SharedMessageQueue& target, | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
74 ServerCommandInstance::IListener& listener) |
| 781 | 75 { |
| 76 if (submitted_) | |
| 77 { | |
| 78 // This job has already been submitted | |
| 79 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 80 } | |
| 81 | |
| 82 CheckOrdering(); | |
| 83 | |
| 84 size_t size = filters_.size(); | |
| 85 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
86 for (std::list<ServerCommandInstance*>::iterator |
| 1304 | 87 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 88 { |
| 89 target.Enqueue(*it); | |
| 90 } | |
| 91 | |
| 92 filters_.clear(); | |
| 93 submitted_ = true; | |
| 94 | |
| 95 return size; | |
| 96 } | |
| 97 | |
| 98 | |
| 1304 | 99 ServerJob::ServerJob() : |
|
2172
84d1d392a9ab
GenerateUuid() not available in sandboxed environments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2142
diff
changeset
|
100 jobId_(SystemToolbox::GenerateUuid()), |
| 1304 | 101 submitted_(false), |
| 102 description_("no description") | |
| 781 | 103 { |
| 104 } | |
| 105 | |
| 106 | |
| 107 ServerJob::~ServerJob() | |
| 108 { | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
109 for (std::list<ServerCommandInstance*>::iterator |
| 1304 | 110 it = filters_.begin(); it != filters_.end(); ++it) |
| 781 | 111 { |
| 112 delete *it; | |
| 113 } | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
114 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
115 for (std::list<IDynamicObject*>::iterator |
| 1304 | 116 it = payloads_.begin(); it != payloads_.end(); ++it) |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
117 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
118 delete *it; |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
119 } |
| 781 | 120 } |
| 121 | |
| 122 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
123 ServerCommandInstance& ServerJob::AddCommand(IServerCommand* filter) |
| 781 | 124 { |
| 125 if (submitted_) | |
| 126 { | |
| 127 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 128 } | |
| 129 | |
|
1000
13e230bbd882
rename filter to command
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
781
diff
changeset
|
130 filters_.push_back(new ServerCommandInstance(filter, jobId_)); |
| 781 | 131 |
| 132 return *filters_.back(); | |
| 133 } | |
|
1009
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
134 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
135 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
136 IDynamicObject& ServerJob::AddPayload(IDynamicObject* payload) |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
137 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
138 if (submitted_) |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
139 { |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
140 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
141 } |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
142 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
143 payloads_.push_back(payload); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
144 |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
145 return *filters_.back(); |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
146 } |
|
26642cecd36d
clearer job interface
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1000
diff
changeset
|
147 |
| 781 | 148 } |