Mercurial > hg > orthanc
annotate OrthancFramework/Sources/JobsEngine/Operations/SequenceOfOperationsJob.cpp @ 4348:93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sun, 06 Dec 2020 12:21:31 +0100 |
| parents | 2ae905070221 |
| children | d9473bd5ed43 |
| rev | line source |
|---|---|
| 2603 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
3640
94f4a18a79cc
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 2603 | 6 * |
| 7 * This program is free software: you can redistribute it and/or | |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public License |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
9 * as published by the Free Software Foundation, either version 3 of |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
10 * the License, or (at your option) any later version. |
| 2603 | 11 * |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
15 * Lesser General Public License for more details. |
| 2603 | 16 * |
|
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
18 * License along with this program. If not, see |
|
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
19 * <http://www.gnu.org/licenses/>. |
| 2603 | 20 **/ |
| 21 | |
| 22 | |
| 23 #include "../../PrecompiledHeaders.h" | |
| 24 #include "SequenceOfOperationsJob.h" | |
| 25 | |
| 26 #include "../../Logging.h" | |
| 27 #include "../../OrthancException.h" | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
28 #include "../../SerializationToolbox.h" |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
29 #include "../IJobUnserializer.h" |
| 2603 | 30 |
| 31 namespace Orthanc | |
| 32 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
33 static const char* CURRENT = "Current"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
34 static const char* DESCRIPTION = "Description"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
35 static const char* NEXT_OPERATIONS = "Next"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
36 static const char* OPERATION = "Operation"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
37 static const char* OPERATIONS = "Operations"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
38 static const char* ORIGINAL_INPUTS = "OriginalInputs"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
39 static const char* TRAILING_TIMEOUT = "TrailingTimeout"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
40 static const char* TYPE = "Type"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
41 static const char* WORK_INPUTS = "WorkInputs"; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
42 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
43 |
| 2603 | 44 class SequenceOfOperationsJob::Operation : public boost::noncopyable |
| 45 { | |
| 46 private: | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
47 size_t index_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
48 std::unique_ptr<IJobOperation> operation_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
49 std::unique_ptr<JobOperationValues> originalInputs_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
50 std::unique_ptr<JobOperationValues> workInputs_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
51 std::list<Operation*> nextOperations_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
52 size_t currentInput_; |
| 2603 | 53 |
| 54 public: | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
55 Operation(size_t index, |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
56 IJobOperation* operation) : |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
57 index_(index), |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
58 operation_(operation), |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
59 originalInputs_(new JobOperationValues), |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
60 workInputs_(new JobOperationValues), |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
61 currentInput_(0) |
| 2603 | 62 { |
| 63 if (operation == NULL) | |
| 64 { | |
| 65 throw OrthancException(ErrorCode_NullPointer); | |
| 66 } | |
| 67 } | |
| 68 | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4304
diff
changeset
|
69 void AddOriginalInput(const IJobOperationValue& value) |
| 2603 | 70 { |
| 71 if (currentInput_ != 0) | |
| 72 { | |
| 73 // Cannot add input after processing has started | |
| 74 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 75 } | |
| 76 else | |
| 77 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
78 originalInputs_->Append(value.Clone()); |
| 2603 | 79 } |
| 80 } | |
| 81 | |
| 82 const JobOperationValues& GetOriginalInputs() const | |
| 83 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
84 return *originalInputs_; |
| 2603 | 85 } |
| 86 | |
| 87 void Reset() | |
| 88 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
89 workInputs_->Clear(); |
| 2603 | 90 currentInput_ = 0; |
| 91 } | |
| 92 | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
93 void AddNextOperation(Operation& other, |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
94 bool unserializing) |
| 2603 | 95 { |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
96 if (other.index_ <= index_) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
97 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
98 throw OrthancException(ErrorCode_InternalError); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
99 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
100 |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
101 if (!unserializing && |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
102 currentInput_ != 0) |
| 2603 | 103 { |
| 104 // Cannot add input after processing has started | |
| 105 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 106 } | |
| 107 else | |
| 108 { | |
| 109 nextOperations_.push_back(&other); | |
| 110 } | |
| 111 } | |
| 112 | |
| 113 bool IsDone() const | |
| 114 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
115 return currentInput_ >= originalInputs_->GetSize() + workInputs_->GetSize(); |
| 2603 | 116 } |
| 117 | |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
118 void Step() |
| 2603 | 119 { |
| 120 if (IsDone()) | |
| 121 { | |
| 122 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 123 } | |
| 124 | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4304
diff
changeset
|
125 const IJobOperationValue* input; |
| 2603 | 126 |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
127 if (currentInput_ < originalInputs_->GetSize()) |
| 2603 | 128 { |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
129 input = &originalInputs_->GetValue(currentInput_); |
| 2603 | 130 } |
| 131 else | |
| 132 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
133 input = &workInputs_->GetValue(currentInput_ - originalInputs_->GetSize()); |
| 2603 | 134 } |
| 135 | |
| 136 JobOperationValues outputs; | |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
137 operation_->Apply(outputs, *input); |
| 2603 | 138 |
| 139 if (!nextOperations_.empty()) | |
| 140 { | |
| 141 std::list<Operation*>::iterator first = nextOperations_.begin(); | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
142 outputs.Move(*(*first)->workInputs_); |
| 2603 | 143 |
| 144 std::list<Operation*>::iterator current = first; | |
| 145 ++current; | |
| 146 | |
| 147 while (current != nextOperations_.end()) | |
| 148 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
149 (*first)->workInputs_->Copy(*(*current)->workInputs_); |
| 2603 | 150 ++current; |
| 151 } | |
| 152 } | |
| 153 | |
| 154 currentInput_ += 1; | |
| 155 } | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
156 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
157 void Serialize(Json::Value& target) const |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
158 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
159 target = Json::objectValue; |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
160 target[CURRENT] = static_cast<unsigned int>(currentInput_); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
161 operation_->Serialize(target[OPERATION]); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
162 originalInputs_->Serialize(target[ORIGINAL_INPUTS]); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
163 workInputs_->Serialize(target[WORK_INPUTS]); |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
164 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
165 Json::Value tmp = Json::arrayValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
166 for (std::list<Operation*>::const_iterator it = nextOperations_.begin(); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
167 it != nextOperations_.end(); ++it) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
168 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
169 tmp.append(static_cast<int>((*it)->index_)); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
170 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
171 |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
172 target[NEXT_OPERATIONS] = tmp; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
173 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
174 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
175 Operation(IJobUnserializer& unserializer, |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
176 Json::Value::ArrayIndex index, |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
177 const Json::Value& serialized) : |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
178 index_(index) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
179 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
180 if (serialized.type() != Json::objectValue || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
181 !serialized.isMember(OPERATION) || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
182 !serialized.isMember(ORIGINAL_INPUTS) || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
183 !serialized.isMember(WORK_INPUTS)) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
184 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
185 throw OrthancException(ErrorCode_BadFileFormat); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
186 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
187 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
188 currentInput_ = SerializationToolbox::ReadUnsignedInteger(serialized, CURRENT); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
189 operation_.reset(unserializer.UnserializeOperation(serialized[OPERATION])); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
190 originalInputs_.reset(JobOperationValues::Unserialize |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
191 (unserializer, serialized[ORIGINAL_INPUTS])); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
192 workInputs_.reset(JobOperationValues::Unserialize |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
193 (unserializer, serialized[WORK_INPUTS])); |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
194 } |
| 2603 | 195 }; |
| 196 | |
| 197 | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
198 SequenceOfOperationsJob::SequenceOfOperationsJob() : |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
199 done_(false), |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
200 current_(0), |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
201 trailingTimeout_(boost::posix_time::milliseconds(1000)) |
| 2603 | 202 { |
| 203 } | |
| 204 | |
| 205 | |
| 206 SequenceOfOperationsJob::~SequenceOfOperationsJob() | |
| 207 { | |
| 208 for (size_t i = 0; i < operations_.size(); i++) | |
| 209 { | |
| 210 if (operations_[i] != NULL) | |
| 211 { | |
| 212 delete operations_[i]; | |
| 213 } | |
| 214 } | |
| 215 } | |
| 216 | |
| 217 | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
218 void SequenceOfOperationsJob::SetDescription(const std::string& description) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
219 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
220 boost::mutex::scoped_lock lock(mutex_); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
221 description_ = description; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
222 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
223 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
224 |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
225 void SequenceOfOperationsJob::GetDescription(std::string& description) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
226 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
227 boost::mutex::scoped_lock lock(mutex_); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
228 description = description_; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
229 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
230 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
231 |
| 2603 | 232 void SequenceOfOperationsJob::Register(IObserver& observer) |
| 233 { | |
| 234 boost::mutex::scoped_lock lock(mutex_); | |
| 235 observers_.push_back(&observer); | |
| 236 } | |
| 237 | |
| 238 | |
|
4348
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
239 #if ORTHANC_BUILDING_FRAMEWORK_LIBRARY == 1 |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
240 void SequenceOfOperationsJob::Lock::AddInput(size_t index, |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
241 const JobOperationValue& value) |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
242 { |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
243 throw OrthancException(ErrorCode_DiscontinuedAbi, "Removed in 1.8.1"); |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
244 } |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
245 #endif |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
246 |
|
93c281752e7a
reintroduced backward ABI compatibility in Orthanc Framework .so for unit tests of Orthanc 1.7.2 to 1.8.0
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4310
diff
changeset
|
247 |
| 4304 | 248 SequenceOfOperationsJob::Lock::Lock(SequenceOfOperationsJob& that) : |
| 249 that_(that), | |
| 250 lock_(that.mutex_) | |
| 251 { | |
| 252 } | |
| 253 | |
| 254 bool SequenceOfOperationsJob::Lock::IsDone() const | |
| 255 { | |
| 256 return that_.done_; | |
| 257 } | |
| 258 | |
| 2603 | 259 void SequenceOfOperationsJob::Lock::SetTrailingOperationTimeout(unsigned int timeout) |
| 260 { | |
| 261 that_.trailingTimeout_ = boost::posix_time::milliseconds(timeout); | |
| 262 } | |
| 263 | |
|
2608
25225f0b4f33
simplification wrt. dicom connection manager
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2603
diff
changeset
|
264 |
| 2603 | 265 size_t SequenceOfOperationsJob::Lock::AddOperation(IJobOperation* operation) |
| 266 { | |
| 267 if (IsDone()) | |
| 268 { | |
| 269 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 270 } | |
| 271 | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
272 size_t index = that_.operations_.size(); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
273 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
274 that_.operations_.push_back(new Operation(index, operation)); |
| 2603 | 275 that_.operationAdded_.notify_one(); |
| 276 | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
277 return index; |
| 2603 | 278 } |
| 279 | |
| 4304 | 280 size_t SequenceOfOperationsJob::Lock::GetOperationsCount() const |
| 281 { | |
| 282 return that_.operations_.size(); | |
| 283 } | |
| 284 | |
| 2603 | 285 |
| 286 void SequenceOfOperationsJob::Lock::AddInput(size_t index, | |
|
4310
2ae905070221
renaming pure interface JobOperationValue as IJobOperationValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4304
diff
changeset
|
287 const IJobOperationValue& value) |
| 2603 | 288 { |
| 289 if (IsDone()) | |
| 290 { | |
| 291 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 292 } | |
| 293 else if (index >= that_.operations_.size() || | |
| 294 index < that_.current_) | |
| 295 { | |
| 296 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 297 } | |
| 298 else | |
| 299 { | |
| 300 that_.operations_[index]->AddOriginalInput(value); | |
| 301 } | |
| 302 } | |
| 303 | |
| 304 | |
| 305 void SequenceOfOperationsJob::Lock::Connect(size_t input, | |
| 306 size_t output) | |
| 307 { | |
| 308 if (IsDone()) | |
| 309 { | |
| 310 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 311 } | |
| 312 else if (input >= output || | |
| 313 input >= that_.operations_.size() || | |
| 314 output >= that_.operations_.size() || | |
| 315 input < that_.current_ || | |
| 316 output < that_.current_) | |
| 317 { | |
| 318 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 319 } | |
| 320 else | |
| 321 { | |
| 322 Operation& a = *that_.operations_[input]; | |
| 323 Operation& b = *that_.operations_[output]; | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
324 a.AddNextOperation(b, false /* not unserializing */); |
| 2603 | 325 } |
| 326 } | |
| 327 | |
| 328 | |
| 4304 | 329 void SequenceOfOperationsJob::Start() |
| 330 { | |
| 331 } | |
| 332 | |
| 333 | |
|
3658
2d90dd30858c
providing job ID to the IJob::Step() methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
334 JobStepResult SequenceOfOperationsJob::Step(const std::string& jobId) |
| 2603 | 335 { |
| 336 boost::mutex::scoped_lock lock(mutex_); | |
| 337 | |
| 338 if (current_ == operations_.size()) | |
| 339 { | |
| 340 LOG(INFO) << "Executing the trailing timeout in the sequence of operations"; | |
| 341 operationAdded_.timed_wait(lock, trailingTimeout_); | |
| 342 | |
| 343 if (current_ == operations_.size()) | |
| 344 { | |
| 345 // No operation was added during the trailing timeout: The | |
| 346 // job is over | |
| 347 LOG(INFO) << "The sequence of operations is over"; | |
| 348 done_ = true; | |
| 349 | |
| 350 for (std::list<IObserver*>::iterator it = observers_.begin(); | |
| 351 it != observers_.end(); ++it) | |
| 352 { | |
| 353 (*it)->SignalDone(*this); | |
| 354 } | |
| 355 | |
| 356 return JobStepResult::Success(); | |
| 357 } | |
| 358 else | |
| 359 { | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
360 LOG(INFO) << "New operation were added to the sequence of operations"; |
| 2603 | 361 } |
| 362 } | |
| 363 | |
| 364 assert(current_ < operations_.size()); | |
| 365 | |
| 366 while (current_ < operations_.size() && | |
| 367 operations_[current_]->IsDone()) | |
| 368 { | |
| 369 current_++; | |
| 370 } | |
| 371 | |
| 372 if (current_ < operations_.size()) | |
| 373 { | |
|
3851
6498739a3c3c
refactoring: TimeoutDicomConnectionManager is now only used by Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3850
diff
changeset
|
374 operations_[current_]->Step(); |
| 2603 | 375 } |
| 376 | |
| 377 return JobStepResult::Continue(); | |
| 378 } | |
| 379 | |
| 380 | |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2811
diff
changeset
|
381 void SequenceOfOperationsJob::Reset() |
| 2603 | 382 { |
| 383 boost::mutex::scoped_lock lock(mutex_); | |
| 384 | |
| 385 current_ = 0; | |
| 386 done_ = false; | |
| 387 | |
| 388 for (size_t i = 0; i < operations_.size(); i++) | |
| 389 { | |
| 390 operations_[i]->Reset(); | |
| 391 } | |
| 392 } | |
| 393 | |
| 4304 | 394 void SequenceOfOperationsJob::Stop(JobStopReason reason) |
| 395 { | |
| 396 } | |
| 397 | |
| 2603 | 398 |
| 399 float SequenceOfOperationsJob::GetProgress() | |
| 400 { | |
| 401 boost::mutex::scoped_lock lock(mutex_); | |
| 402 | |
| 403 return (static_cast<float>(current_) / | |
| 404 static_cast<float>(operations_.size() + 1)); | |
| 405 } | |
| 406 | |
| 4304 | 407 void SequenceOfOperationsJob::GetJobType(std::string& target) |
| 408 { | |
| 409 target = "SequenceOfOperations"; | |
| 410 } | |
| 411 | |
| 2603 | 412 |
| 413 void SequenceOfOperationsJob::GetPublicContent(Json::Value& value) | |
| 414 { | |
| 415 boost::mutex::scoped_lock lock(mutex_); | |
| 416 | |
| 417 value["CountOperations"] = static_cast<unsigned int>(operations_.size()); | |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
418 value["Description"] = description_; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
419 } |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
420 |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
421 |
|
2663
228e2783ce83
some jobs might not be serializable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2648
diff
changeset
|
422 bool SequenceOfOperationsJob::Serialize(Json::Value& value) |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
423 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
424 boost::mutex::scoped_lock lock(mutex_); |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
425 |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
426 value = Json::objectValue; |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
427 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
428 std::string jobType; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
429 GetJobType(jobType); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
430 value[TYPE] = jobType; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
431 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
432 value[DESCRIPTION] = description_; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
433 value[TRAILING_TIMEOUT] = static_cast<unsigned int>(trailingTimeout_.total_milliseconds()); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
434 value[CURRENT] = static_cast<unsigned int>(current_); |
|
2665
389d050a2e66
fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2663
diff
changeset
|
435 |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2620
diff
changeset
|
436 Json::Value tmp = Json::arrayValue; |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
437 for (size_t i = 0; i < operations_.size(); i++) |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
438 { |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
439 Json::Value operation = Json::objectValue; |
|
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
440 operations_[i]->Serialize(operation); |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2620
diff
changeset
|
441 tmp.append(operation); |
|
2616
2f3007bf0708
event queues in Lua, serialization of sequence of operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2608
diff
changeset
|
442 } |
|
2621
83ac5a05ce84
primitives for unserializing jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2620
diff
changeset
|
443 |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
444 value[OPERATIONS] = tmp; |
|
2663
228e2783ce83
some jobs might not be serializable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2648
diff
changeset
|
445 |
|
228e2783ce83
some jobs might not be serializable
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2648
diff
changeset
|
446 return true; |
| 2603 | 447 } |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
448 |
| 4304 | 449 bool SequenceOfOperationsJob::GetOutput(std::string& output, |
| 450 MimeType& mime, | |
| 451 const std::string& key) | |
| 452 { | |
| 453 return false; | |
| 454 } | |
| 455 | |
| 456 void SequenceOfOperationsJob::AwakeTrailingSleep() | |
| 457 { | |
| 458 operationAdded_.notify_one(); | |
| 459 } | |
| 460 | |
|
2666
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
461 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
462 SequenceOfOperationsJob::SequenceOfOperationsJob(IJobUnserializer& unserializer, |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
463 const Json::Value& serialized) : |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
464 done_(false) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
465 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
466 std::string jobType; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
467 GetJobType(jobType); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
468 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
469 if (SerializationToolbox::ReadString(serialized, TYPE) != jobType || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
470 !serialized.isMember(OPERATIONS) || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
471 serialized[OPERATIONS].type() != Json::arrayValue) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
472 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
473 throw OrthancException(ErrorCode_BadFileFormat); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
474 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
475 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
476 description_ = SerializationToolbox::ReadString(serialized, DESCRIPTION); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
477 trailingTimeout_ = boost::posix_time::milliseconds |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
478 (SerializationToolbox::ReadUnsignedInteger(serialized, TRAILING_TIMEOUT)); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
479 current_ = SerializationToolbox::ReadUnsignedInteger(serialized, CURRENT); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
480 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
481 const Json::Value& ops = serialized[OPERATIONS]; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
482 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
483 // Unserialize the individual operations |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
484 operations_.reserve(ops.size()); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
485 for (Json::Value::ArrayIndex i = 0; i < ops.size(); i++) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
486 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
487 operations_.push_back(new Operation(unserializer, i, ops[i])); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
488 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
489 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
490 // Connect the next operations |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
491 for (Json::Value::ArrayIndex i = 0; i < ops.size(); i++) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
492 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
493 if (!ops[i].isMember(NEXT_OPERATIONS) || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
494 ops[i][NEXT_OPERATIONS].type() != Json::arrayValue) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
495 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
496 throw OrthancException(ErrorCode_BadFileFormat); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
497 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
498 |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
499 const Json::Value& next = ops[i][NEXT_OPERATIONS]; |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
500 for (Json::Value::ArrayIndex j = 0; j < next.size(); j++) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
501 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
502 if (next[j].type() != Json::intValue || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
503 next[j].asInt() < 0 || |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
504 next[j].asUInt() >= operations_.size()) |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
505 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
506 throw OrthancException(ErrorCode_BadFileFormat); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
507 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
508 else |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
509 { |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
510 operations_[i]->AddNextOperation(*operations_[next[j].asUInt()], true); |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
511 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
512 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
513 } |
|
2540ac79ab6c
SequenceOfOperationsJob serialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2665
diff
changeset
|
514 } |
| 2603 | 515 } |