Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/StorageCommitmentScpJob.cpp @ 3642:fddf3fc82362 storage-commitment
upgrade to year 2020
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 31 Jan 2020 17:15:56 +0100 |
| parents | 0c9a8f6d2349 |
| children | 115f82775c46 |
| rev | line source |
|---|---|
| 3636 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
3642
fddf3fc82362
upgrade to year 2020
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3639
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 3636 | 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 | |
| 34 #include "../PrecompiledHeadersServer.h" | |
| 35 #include "StorageCommitmentScpJob.h" | |
| 36 | |
| 37 #include "../../Core/DicomNetworking/DicomUserConnection.h" | |
| 38 #include "../../Core/Logging.h" | |
| 39 #include "../../Core/OrthancException.h" | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
40 #include "../../Core/SerializationToolbox.h" |
| 3636 | 41 #include "../OrthancConfiguration.h" |
| 42 #include "../ServerContext.h" | |
| 43 | |
| 44 | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
45 static const char* ANSWER = "Answer"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
46 static const char* CALLED_AET = "CalledAet"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
47 static const char* FAILED_SOP_CLASS_UIDS = "FailedSopClassUids"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
48 static const char* FAILED_SOP_INSTANCE_UIDS = "FailedSopInstanceUids"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
49 static const char* LOOKUP = "Lookup"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
50 static const char* REMOTE_MODALITY = "RemoteModality"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
51 static const char* SOP_CLASS_UID = "SopClassUid"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
52 static const char* SOP_INSTANCE_UID = "SopInstanceUid"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
53 static const char* SUCCESS_SOP_CLASS_UIDS = "SuccessSopClassUids"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
54 static const char* SUCCESS_SOP_INSTANCE_UIDS = "SuccessSopInstanceUids"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
55 static const char* TRANSACTION_UID = "TransactionUid"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
56 static const char* TYPE = "Type"; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
57 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
58 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
59 |
| 3636 | 60 namespace Orthanc |
| 61 { | |
| 62 class StorageCommitmentScpJob::LookupCommand : public SetOfCommandsJob::ICommand | |
| 63 { | |
| 64 private: | |
| 65 StorageCommitmentScpJob& that_; | |
| 66 std::string sopClassUid_; | |
| 67 std::string sopInstanceUid_; | |
| 68 | |
| 69 public: | |
| 70 LookupCommand(StorageCommitmentScpJob& that, | |
| 71 const std::string& sopClassUid, | |
| 72 const std::string& sopInstanceUid) : | |
| 73 that_(that), | |
| 74 sopClassUid_(sopClassUid), | |
| 75 sopInstanceUid_(sopInstanceUid) | |
| 76 { | |
| 77 } | |
| 78 | |
| 79 virtual bool Execute() | |
| 80 { | |
| 81 that_.LookupInstance(sopClassUid_, sopInstanceUid_); | |
| 82 return true; | |
| 83 } | |
| 84 | |
| 85 virtual void Serialize(Json::Value& target) const | |
| 86 { | |
| 87 target = Json::objectValue; | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
88 target[TYPE] = LOOKUP; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
89 target[SOP_CLASS_UID] = sopClassUid_; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
90 target[SOP_INSTANCE_UID] = sopInstanceUid_; |
| 3636 | 91 } |
| 92 }; | |
| 93 | |
| 94 | |
| 95 class StorageCommitmentScpJob::AnswerCommand : public SetOfCommandsJob::ICommand | |
| 96 { | |
| 97 private: | |
| 98 StorageCommitmentScpJob& that_; | |
| 99 | |
| 100 public: | |
| 101 AnswerCommand(StorageCommitmentScpJob& that) : | |
| 102 that_(that) | |
| 103 { | |
|
3639
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
104 if (that_.ready_) |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
105 { |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
106 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
107 } |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
108 else |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
109 { |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
110 that_.ready_ = true; |
|
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
111 } |
| 3636 | 112 } |
| 113 | |
| 114 virtual bool Execute() | |
| 115 { | |
| 116 that_.Answer(); | |
| 117 return true; | |
| 118 } | |
| 119 | |
| 120 virtual void Serialize(Json::Value& target) const | |
| 121 { | |
| 122 target = Json::objectValue; | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
123 target[TYPE] = ANSWER; |
| 3636 | 124 } |
| 125 }; | |
| 126 | |
| 127 | |
| 128 class StorageCommitmentScpJob::Unserializer : public SetOfCommandsJob::ICommandUnserializer | |
| 129 { | |
| 130 private: | |
| 131 StorageCommitmentScpJob& that_; | |
| 132 | |
| 133 public: | |
| 134 Unserializer(StorageCommitmentScpJob& that) : | |
| 135 that_(that) | |
| 136 { | |
|
3639
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
137 that_.ready_ = false; |
| 3636 | 138 } |
| 139 | |
| 140 virtual ICommand* Unserialize(const Json::Value& source) const | |
| 141 { | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
142 const std::string type = SerializationToolbox::ReadString(source, TYPE); |
| 3636 | 143 |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
144 if (type == LOOKUP) |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
145 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
146 return new LookupCommand(that_, |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
147 SerializationToolbox::ReadString(source, SOP_CLASS_UID), |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
148 SerializationToolbox::ReadString(source, SOP_INSTANCE_UID)); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
149 } |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
150 else if (type == ANSWER) |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
151 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
152 return new AnswerCommand(that_); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
153 } |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
154 else |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
155 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
156 throw OrthancException(ErrorCode_BadFileFormat); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
157 } |
| 3636 | 158 } |
| 159 }; | |
| 160 | |
| 161 | |
| 162 void StorageCommitmentScpJob::LookupInstance(const std::string& sopClassUid, | |
| 163 const std::string& sopInstanceUid) | |
| 164 { | |
| 165 bool success = false; | |
| 166 | |
| 167 try | |
| 168 { | |
| 169 std::vector<std::string> orthancId; | |
| 170 context_.GetIndex().LookupIdentifierExact(orthancId, ResourceType_Instance, DICOM_TAG_SOP_INSTANCE_UID, sopInstanceUid); | |
| 171 | |
| 172 if (orthancId.size() == 1) | |
| 173 { | |
| 174 std::string a, b; | |
| 175 | |
| 176 // Make sure that the DICOM file can be re-read by DCMTK | |
| 177 // from the file storage, and that the actual SOP | |
| 178 // class/instance UIDs do match | |
| 179 ServerContext::DicomCacheLocker locker(context_, orthancId[0]); | |
| 180 if (locker.GetDicom().GetTagValue(a, DICOM_TAG_SOP_CLASS_UID) && | |
| 181 locker.GetDicom().GetTagValue(b, DICOM_TAG_SOP_INSTANCE_UID) && | |
| 182 a == sopClassUid && | |
| 183 b == sopInstanceUid) | |
| 184 { | |
| 185 success = true; | |
| 186 } | |
| 187 } | |
| 188 } | |
| 189 catch (OrthancException&) | |
| 190 { | |
| 191 } | |
| 192 | |
| 193 LOG(INFO) << " Storage commitment SCP job: " << (success ? "Success" : "Failure") | |
| 194 << " while looking for " << sopClassUid << " / " << sopInstanceUid; | |
| 195 | |
| 196 if (success) | |
| 197 { | |
| 198 successSopClassUids_.push_back(sopClassUid); | |
| 199 successSopInstanceUids_.push_back(sopInstanceUid); | |
| 200 } | |
| 201 else | |
| 202 { | |
| 203 failedSopClassUids_.push_back(sopClassUid); | |
| 204 failedSopInstanceUids_.push_back(sopInstanceUid); | |
| 205 } | |
| 206 } | |
| 207 | |
| 208 | |
| 209 void StorageCommitmentScpJob::Answer() | |
| 210 { | |
| 211 LOG(INFO) << " Storage commitment SCP job: Sending answer"; | |
| 212 | |
| 213 DicomUserConnection scu(calledAet_, remoteModality_); | |
| 214 scu.ReportStorageCommitment(transactionUid_, successSopClassUids_, successSopInstanceUids_, | |
| 215 failedSopClassUids_, failedSopInstanceUids_); | |
| 216 } | |
| 217 | |
| 218 | |
| 219 StorageCommitmentScpJob::StorageCommitmentScpJob(ServerContext& context, | |
| 220 const std::string& transactionUid, | |
| 221 const std::string& remoteAet, | |
| 222 const std::string& calledAet) : | |
| 223 context_(context), | |
| 224 ready_(false), | |
| 225 transactionUid_(transactionUid), | |
| 226 calledAet_(calledAet) | |
| 227 { | |
| 228 { | |
| 229 OrthancConfiguration::ReaderLock lock; | |
| 230 if (!lock.GetConfiguration().LookupDicomModalityUsingAETitle(remoteModality_, remoteAet)) | |
| 231 { | |
| 232 throw OrthancException(ErrorCode_InexistentItem, | |
| 233 "Unknown remote modality for storage commitment SCP: " + remoteAet); | |
| 234 } | |
| 235 } | |
| 236 } | |
| 237 | |
| 238 | |
| 239 void StorageCommitmentScpJob::AddInstance(const std::string& sopClassUid, | |
| 240 const std::string& sopInstanceUid) | |
| 241 { | |
| 242 if (ready_) | |
| 243 { | |
| 244 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 245 } | |
| 246 else | |
| 247 { | |
| 248 AddCommand(new LookupCommand(*this, sopClassUid, sopInstanceUid)); | |
| 249 } | |
| 250 } | |
| 251 | |
| 252 | |
| 253 void StorageCommitmentScpJob::MarkAsReady() | |
| 254 { | |
|
3639
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
255 AddCommand(new AnswerCommand(*this)); |
| 3636 | 256 } |
| 257 | |
| 258 | |
| 259 void StorageCommitmentScpJob::GetPublicContent(Json::Value& value) | |
| 260 { | |
| 261 SetOfCommandsJob::GetPublicContent(value); | |
| 262 | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
263 value["CalledAet"] = calledAet_; |
| 3636 | 264 value["RemoteAet"] = remoteModality_.GetApplicationEntityTitle(); |
| 265 value["TransactionUid"] = transactionUid_; | |
| 266 } | |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
267 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
268 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
269 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
270 StorageCommitmentScpJob::StorageCommitmentScpJob(ServerContext& context, |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
271 const Json::Value& serialized) : |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
272 SetOfCommandsJob(new Unserializer(*this), serialized), |
|
3639
0c9a8f6d2349
better unserialization
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3638
diff
changeset
|
273 context_(context) |
|
3638
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
274 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
275 transactionUid_ = SerializationToolbox::ReadString(serialized, TRANSACTION_UID); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
276 remoteModality_ = RemoteModalityParameters(serialized[REMOTE_MODALITY]); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
277 calledAet_ = SerializationToolbox::ReadString(serialized, CALLED_AET); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
278 SerializationToolbox::ReadListOfStrings(successSopClassUids_, serialized, SUCCESS_SOP_CLASS_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
279 SerializationToolbox::ReadListOfStrings(successSopInstanceUids_, serialized, SUCCESS_SOP_INSTANCE_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
280 SerializationToolbox::ReadListOfStrings(failedSopClassUids_, serialized, FAILED_SOP_CLASS_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
281 SerializationToolbox::ReadListOfStrings(failedSopInstanceUids_, serialized, FAILED_SOP_INSTANCE_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
282 } |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
283 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
284 |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
285 bool StorageCommitmentScpJob::Serialize(Json::Value& target) |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
286 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
287 if (!SetOfCommandsJob::Serialize(target)) |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
288 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
289 return false; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
290 } |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
291 else |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
292 { |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
293 target[TRANSACTION_UID] = transactionUid_; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
294 remoteModality_.Serialize(target[REMOTE_MODALITY], true /* force advanced format */); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
295 target[CALLED_AET] = calledAet_; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
296 SerializationToolbox::WriteListOfStrings(target, successSopClassUids_, SUCCESS_SOP_CLASS_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
297 SerializationToolbox::WriteListOfStrings(target, successSopInstanceUids_, SUCCESS_SOP_INSTANCE_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
298 SerializationToolbox::WriteListOfStrings(target, failedSopClassUids_, FAILED_SOP_CLASS_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
299 SerializationToolbox::WriteListOfStrings(target, failedSopInstanceUids_, FAILED_SOP_INSTANCE_UIDS); |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
300 return true; |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
301 } |
|
ae866fc06df5
serialization of StorageCommitmentScpJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3636
diff
changeset
|
302 } |
| 3636 | 303 } |