Mercurial > hg > orthanc
annotate OrthancServer/ServerJobs/ArchiveJob.cpp @ 3930:b99acc213937 transcoding
transcoder plugins and GDCM transcoding are working
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 14 May 2020 19:20:40 +0200 |
| parents | 6ddad3e0b569 |
| children | 0b3256c3ee14 |
| rev | line source |
|---|---|
| 2632 | 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:
3240
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
| 2632 | 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 "ArchiveJob.h" | |
| 36 | |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
37 #include "../../Core/Cache/SharedArchive.h" |
| 2632 | 38 #include "../../Core/Compression/HierarchicalZipWriter.h" |
| 39 #include "../../Core/DicomParsing/DicomDirWriter.h" | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
40 #include "../../Core/DicomParsing/FromDcmtkBridge.h" |
| 2632 | 41 #include "../../Core/Logging.h" |
| 42 #include "../../Core/OrthancException.h" | |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
43 #include "../OrthancConfiguration.h" |
|
3095
beeeb6096f27
removing dependencies upon ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3060
diff
changeset
|
44 #include "../ServerContext.h" |
| 2632 | 45 |
| 46 #include <stdio.h> | |
| 47 | |
| 48 #if defined(_MSC_VER) | |
| 49 #define snprintf _snprintf | |
| 50 #endif | |
| 51 | |
| 52 static const uint64_t MEGA_BYTES = 1024 * 1024; | |
| 53 static const uint64_t GIGA_BYTES = 1024 * 1024 * 1024; | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
54 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
55 static const char* const MEDIA_IMAGES_FOLDER = "IMAGES"; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
56 static const char* const KEY_DESCRIPTION = "Description"; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
57 static const char* const KEY_INSTANCES_COUNT = "InstancesCount"; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
58 static const char* const KEY_UNCOMPRESSED_SIZE_MB = "UncompressedSizeMB"; |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
59 static const char* const KEY_TRANSCODE = "Transcode"; |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
60 |
| 2632 | 61 |
| 62 namespace Orthanc | |
| 63 { | |
| 64 static bool IsZip64Required(uint64_t uncompressedSize, | |
| 65 unsigned int countInstances) | |
| 66 { | |
| 67 static const uint64_t SAFETY_MARGIN = 64 * MEGA_BYTES; // Should be large enough to hold DICOMDIR | |
| 68 static const unsigned int FILES_MARGIN = 10; | |
| 69 | |
| 70 /** | |
| 71 * Determine whether ZIP64 is required. Original ZIP format can | |
| 72 * store up to 2GB of data (some implementation supporting up to | |
| 73 * 4GB of data), and up to 65535 files. | |
| 74 * https://en.wikipedia.org/wiki/Zip_(file_format)#ZIP64 | |
| 75 **/ | |
| 76 | |
| 77 const bool isZip64 = (uncompressedSize >= 2 * GIGA_BYTES - SAFETY_MARGIN || | |
| 78 countInstances >= 65535 - FILES_MARGIN); | |
| 79 | |
| 80 LOG(INFO) << "Creating a ZIP file with " << countInstances << " files of size " | |
| 81 << (uncompressedSize / MEGA_BYTES) << "MB using the " | |
| 82 << (isZip64 ? "ZIP64" : "ZIP32") << " file format"; | |
| 83 | |
| 84 return isZip64; | |
| 85 } | |
| 86 | |
| 87 | |
| 88 class ArchiveJob::ResourceIdentifiers : public boost::noncopyable | |
| 89 { | |
| 90 private: | |
| 91 ResourceType level_; | |
| 92 std::string patient_; | |
| 93 std::string study_; | |
| 94 std::string series_; | |
| 95 std::string instance_; | |
| 96 | |
| 97 static void GoToParent(ServerIndex& index, | |
| 98 std::string& current) | |
| 99 { | |
| 100 std::string tmp; | |
| 101 | |
| 102 if (index.LookupParent(tmp, current)) | |
| 103 { | |
| 104 current = tmp; | |
| 105 } | |
| 106 else | |
| 107 { | |
| 108 throw OrthancException(ErrorCode_UnknownResource); | |
| 109 } | |
| 110 } | |
| 111 | |
| 112 | |
| 113 public: | |
| 114 ResourceIdentifiers(ServerIndex& index, | |
| 115 const std::string& publicId) | |
| 116 { | |
| 117 if (!index.LookupResourceType(level_, publicId)) | |
| 118 { | |
| 119 throw OrthancException(ErrorCode_UnknownResource); | |
| 120 } | |
| 121 | |
| 122 std::string current = publicId;; | |
| 123 switch (level_) // Do not add "break" below! | |
| 124 { | |
| 125 case ResourceType_Instance: | |
| 126 instance_ = current; | |
| 127 GoToParent(index, current); | |
| 128 | |
| 129 case ResourceType_Series: | |
| 130 series_ = current; | |
| 131 GoToParent(index, current); | |
| 132 | |
| 133 case ResourceType_Study: | |
| 134 study_ = current; | |
| 135 GoToParent(index, current); | |
| 136 | |
| 137 case ResourceType_Patient: | |
| 138 patient_ = current; | |
| 139 break; | |
| 140 | |
| 141 default: | |
| 142 throw OrthancException(ErrorCode_InternalError); | |
| 143 } | |
| 144 } | |
| 145 | |
| 146 ResourceType GetLevel() const | |
| 147 { | |
| 148 return level_; | |
| 149 } | |
| 150 | |
| 151 const std::string& GetIdentifier(ResourceType level) const | |
| 152 { | |
| 153 // Some sanity check to ensure enumerations are not altered | |
| 154 assert(ResourceType_Patient < ResourceType_Study); | |
| 155 assert(ResourceType_Study < ResourceType_Series); | |
| 156 assert(ResourceType_Series < ResourceType_Instance); | |
| 157 | |
| 158 if (level > level_) | |
| 159 { | |
| 160 throw OrthancException(ErrorCode_InternalError); | |
| 161 } | |
| 162 | |
| 163 switch (level) | |
| 164 { | |
| 165 case ResourceType_Patient: | |
| 166 return patient_; | |
| 167 | |
| 168 case ResourceType_Study: | |
| 169 return study_; | |
| 170 | |
| 171 case ResourceType_Series: | |
| 172 return series_; | |
| 173 | |
| 174 case ResourceType_Instance: | |
| 175 return instance_; | |
| 176 | |
| 177 default: | |
| 178 throw OrthancException(ErrorCode_InternalError); | |
| 179 } | |
| 180 } | |
| 181 }; | |
| 182 | |
| 183 | |
| 184 class ArchiveJob::IArchiveVisitor : public boost::noncopyable | |
| 185 { | |
| 186 public: | |
| 187 virtual ~IArchiveVisitor() | |
| 188 { | |
| 189 } | |
| 190 | |
| 191 virtual void Open(ResourceType level, | |
| 192 const std::string& publicId) = 0; | |
| 193 | |
| 194 virtual void Close() = 0; | |
| 195 | |
| 196 virtual void AddInstance(const std::string& instanceId, | |
| 197 const FileInfo& dicom) = 0; | |
| 198 }; | |
| 199 | |
| 200 | |
| 201 class ArchiveJob::ArchiveIndex : public boost::noncopyable | |
| 202 { | |
| 203 private: | |
| 204 struct Instance | |
| 205 { | |
| 206 std::string id_; | |
| 207 FileInfo dicom_; | |
| 208 | |
| 209 Instance(const std::string& id, | |
| 210 const FileInfo& dicom) : | |
| 211 id_(id), dicom_(dicom) | |
| 212 { | |
| 213 } | |
| 214 }; | |
| 215 | |
| 216 // A "NULL" value for ArchiveIndex indicates a non-expanded node | |
| 217 typedef std::map<std::string, ArchiveIndex*> Resources; | |
| 218 | |
| 219 ResourceType level_; | |
| 220 Resources resources_; // Only at patient/study/series level | |
| 221 std::list<Instance> instances_; // Only at instance level | |
| 222 | |
| 223 | |
| 224 void AddResourceToExpand(ServerIndex& index, | |
| 225 const std::string& id) | |
| 226 { | |
| 227 if (level_ == ResourceType_Instance) | |
| 228 { | |
| 229 FileInfo tmp; | |
| 230 if (index.LookupAttachment(tmp, id, FileContentType_Dicom)) | |
| 231 { | |
| 232 instances_.push_back(Instance(id, tmp)); | |
| 233 } | |
| 234 } | |
| 235 else | |
| 236 { | |
| 237 resources_[id] = NULL; | |
| 238 } | |
| 239 } | |
| 240 | |
| 241 | |
| 242 public: | |
| 243 ArchiveIndex(ResourceType level) : | |
| 244 level_(level) | |
| 245 { | |
| 246 } | |
| 247 | |
| 248 ~ArchiveIndex() | |
| 249 { | |
| 250 for (Resources::iterator it = resources_.begin(); | |
| 251 it != resources_.end(); ++it) | |
| 252 { | |
| 253 delete it->second; | |
| 254 } | |
| 255 } | |
| 256 | |
| 257 | |
| 258 void Add(ServerIndex& index, | |
| 259 const ResourceIdentifiers& resource) | |
| 260 { | |
| 261 const std::string& id = resource.GetIdentifier(level_); | |
| 262 Resources::iterator previous = resources_.find(id); | |
| 263 | |
| 264 if (level_ == ResourceType_Instance) | |
| 265 { | |
| 266 AddResourceToExpand(index, id); | |
| 267 } | |
| 268 else if (resource.GetLevel() == level_) | |
| 269 { | |
| 270 // Mark this resource for further expansion | |
| 271 if (previous != resources_.end()) | |
| 272 { | |
| 273 delete previous->second; | |
| 274 } | |
| 275 | |
| 276 resources_[id] = NULL; | |
| 277 } | |
| 278 else if (previous == resources_.end()) | |
| 279 { | |
| 280 // This is the first time we meet this resource | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
281 std::unique_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_))); |
| 2632 | 282 child->Add(index, resource); |
| 283 resources_[id] = child.release(); | |
| 284 } | |
| 285 else if (previous->second != NULL) | |
| 286 { | |
| 287 previous->second->Add(index, resource); | |
| 288 } | |
| 289 else | |
| 290 { | |
| 291 // Nothing to do: This item is marked for further expansion | |
| 292 } | |
| 293 } | |
| 294 | |
| 295 | |
| 296 void Expand(ServerIndex& index) | |
| 297 { | |
| 298 if (level_ == ResourceType_Instance) | |
| 299 { | |
| 300 // Expanding an instance node makes no sense | |
| 301 return; | |
| 302 } | |
| 303 | |
| 304 for (Resources::iterator it = resources_.begin(); | |
| 305 it != resources_.end(); ++it) | |
| 306 { | |
| 307 if (it->second == NULL) | |
| 308 { | |
| 309 // This is resource is marked for expansion | |
| 310 std::list<std::string> children; | |
| 311 index.GetChildren(children, it->first); | |
| 312 | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
313 std::unique_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_))); |
| 2632 | 314 |
| 315 for (std::list<std::string>::const_iterator | |
| 316 it2 = children.begin(); it2 != children.end(); ++it2) | |
| 317 { | |
| 318 child->AddResourceToExpand(index, *it2); | |
| 319 } | |
| 320 | |
| 321 it->second = child.release(); | |
| 322 } | |
| 323 | |
| 324 assert(it->second != NULL); | |
| 325 it->second->Expand(index); | |
| 326 } | |
| 327 } | |
| 328 | |
| 329 | |
| 330 void Apply(IArchiveVisitor& visitor) const | |
| 331 { | |
| 332 if (level_ == ResourceType_Instance) | |
| 333 { | |
| 334 for (std::list<Instance>::const_iterator | |
| 335 it = instances_.begin(); it != instances_.end(); ++it) | |
| 336 { | |
| 337 visitor.AddInstance(it->id_, it->dicom_); | |
| 338 } | |
| 339 } | |
| 340 else | |
| 341 { | |
| 342 for (Resources::const_iterator it = resources_.begin(); | |
| 343 it != resources_.end(); ++it) | |
| 344 { | |
| 345 assert(it->second != NULL); // There must have been a call to "Expand()" | |
| 346 visitor.Open(level_, it->first); | |
| 347 it->second->Apply(visitor); | |
| 348 visitor.Close(); | |
| 349 } | |
| 350 } | |
| 351 } | |
| 352 }; | |
| 353 | |
| 354 | |
| 355 | |
| 356 class ArchiveJob::ZipCommands : public boost::noncopyable | |
| 357 { | |
| 358 private: | |
| 359 enum Type | |
| 360 { | |
| 361 Type_OpenDirectory, | |
| 362 Type_CloseDirectory, | |
| 363 Type_WriteInstance | |
| 364 }; | |
| 365 | |
| 366 class Command : public boost::noncopyable | |
| 367 { | |
| 368 private: | |
| 369 Type type_; | |
| 370 std::string filename_; | |
| 371 std::string instanceId_; | |
| 372 FileInfo info_; | |
| 373 | |
| 374 public: | |
| 375 explicit Command(Type type) : | |
| 376 type_(type) | |
| 377 { | |
| 378 assert(type_ == Type_CloseDirectory); | |
| 379 } | |
| 380 | |
| 381 Command(Type type, | |
| 382 const std::string& filename) : | |
| 383 type_(type), | |
| 384 filename_(filename) | |
| 385 { | |
| 386 assert(type_ == Type_OpenDirectory); | |
| 387 } | |
| 388 | |
| 389 Command(Type type, | |
| 390 const std::string& filename, | |
| 391 const std::string& instanceId, | |
| 392 const FileInfo& info) : | |
| 393 type_(type), | |
| 394 filename_(filename), | |
| 395 instanceId_(instanceId), | |
| 396 info_(info) | |
| 397 { | |
| 398 assert(type_ == Type_WriteInstance); | |
| 399 } | |
| 400 | |
| 401 void Apply(HierarchicalZipWriter& writer, | |
| 402 ServerContext& context, | |
| 403 DicomDirWriter* dicomDir, | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
404 const std::string& dicomDirFolder, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
405 bool transcode, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
406 DicomTransferSyntax transferSyntax) const |
| 2632 | 407 { |
| 408 switch (type_) | |
| 409 { | |
| 410 case Type_OpenDirectory: | |
| 411 writer.OpenDirectory(filename_.c_str()); | |
| 412 break; | |
| 413 | |
| 414 case Type_CloseDirectory: | |
| 415 writer.CloseDirectory(); | |
| 416 break; | |
| 417 | |
| 418 case Type_WriteInstance: | |
| 419 { | |
| 420 std::string content; | |
| 421 | |
| 422 try | |
| 423 { | |
| 424 context.ReadAttachment(content, info_); | |
| 425 } | |
| 426 catch (OrthancException& e) | |
| 427 { | |
| 428 LOG(WARNING) << "An instance was removed after the job was issued: " << instanceId_; | |
| 429 return; | |
| 430 } | |
| 2636 | 431 |
| 432 //boost::this_thread::sleep(boost::posix_time::milliseconds(300)); | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
433 |
| 2632 | 434 writer.OpenFile(filename_.c_str()); |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
435 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
436 bool transcodeSuccess = false; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
437 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
438 std::unique_ptr<ParsedDicomFile> parsed; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
439 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
440 if (transcode) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
441 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
442 // New in Orthanc 1.7.0 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
443 std::set<DicomTransferSyntax> syntaxes; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
444 syntaxes.insert(transferSyntax); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
445 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
446 parsed.reset(new ParsedDicomFile(content)); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
447 const char* data = content.empty() ? NULL : content.c_str(); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
448 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
449 std::unique_ptr<IDicomTranscoder::TranscodedDicom> transcodedDicom( |
|
3930
b99acc213937
transcoder plugins and GDCM transcoding are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3913
diff
changeset
|
450 context.TranscodeToParsed(parsed->GetDcmtkObject(), data, content.size(), |
|
b99acc213937
transcoder plugins and GDCM transcoding are working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3913
diff
changeset
|
451 syntaxes, true /* allow new SOP instance UID */)); |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
452 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
453 if (transcodedDicom.get() != NULL && |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
454 transcodedDicom->GetDicom().getDataset() != NULL) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
455 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
456 std::string transcoded; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
457 FromDcmtkBridge::SaveToMemoryBuffer( |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
458 transcoded, *transcodedDicom->GetDicom().getDataset()); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
459 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
460 writer.Write(transcoded); |
| 2632 | 461 |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
462 if (dicomDir != NULL) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
463 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
464 std::unique_ptr<ParsedDicomFile> tmp( |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
465 ParsedDicomFile::AcquireDcmtkObject(transcodedDicom->ReleaseDicom())); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
466 dicomDir->Add(dicomDirFolder, filename_, *tmp); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
467 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
468 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
469 transcodeSuccess = true; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
470 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
471 else |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
472 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
473 LOG(INFO) << "Cannot transcode instance " << instanceId_ |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
474 << " to transfer syntax: " << GetTransferSyntaxUid(transferSyntax); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
475 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
476 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
477 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
478 if (!transcodeSuccess) |
| 2632 | 479 { |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
480 writer.Write(content); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
481 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
482 if (dicomDir != NULL) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
483 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
484 if (parsed.get() == NULL) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
485 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
486 parsed.reset(new ParsedDicomFile(content)); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
487 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
488 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
489 dicomDir->Add(dicomDirFolder, filename_, *parsed); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
490 } |
| 2632 | 491 } |
| 492 | |
| 493 break; | |
| 494 } | |
| 495 | |
| 496 default: | |
| 497 throw OrthancException(ErrorCode_InternalError); | |
| 498 } | |
| 499 } | |
| 500 }; | |
| 501 | |
| 502 std::deque<Command*> commands_; | |
| 503 uint64_t uncompressedSize_; | |
| 504 unsigned int instancesCount_; | |
| 505 | |
| 506 | |
| 507 void ApplyInternal(HierarchicalZipWriter& writer, | |
| 508 ServerContext& context, | |
| 509 size_t index, | |
| 510 DicomDirWriter* dicomDir, | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
511 const std::string& dicomDirFolder, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
512 bool transcode, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
513 DicomTransferSyntax transferSyntax) const |
| 2632 | 514 { |
| 515 if (index >= commands_.size()) | |
| 516 { | |
| 517 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 518 } | |
| 519 | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
520 commands_[index]->Apply(writer, context, dicomDir, dicomDirFolder, transcode, transferSyntax); |
| 2632 | 521 } |
| 522 | |
| 523 public: | |
| 524 ZipCommands() : | |
| 525 uncompressedSize_(0), | |
| 526 instancesCount_(0) | |
| 527 { | |
| 528 } | |
| 529 | |
| 530 ~ZipCommands() | |
| 531 { | |
| 532 for (std::deque<Command*>::iterator it = commands_.begin(); | |
| 533 it != commands_.end(); ++it) | |
| 534 { | |
| 535 assert(*it != NULL); | |
| 536 delete *it; | |
| 537 } | |
| 538 } | |
| 539 | |
| 540 size_t GetSize() const | |
| 541 { | |
| 542 return commands_.size(); | |
| 543 } | |
| 544 | |
| 545 unsigned int GetInstancesCount() const | |
| 546 { | |
| 547 return instancesCount_; | |
| 548 } | |
| 549 | |
| 550 uint64_t GetUncompressedSize() const | |
| 551 { | |
| 552 return uncompressedSize_; | |
| 553 } | |
| 554 | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
555 // "media" flavor (with DICOMDIR) |
| 2632 | 556 void Apply(HierarchicalZipWriter& writer, |
| 557 ServerContext& context, | |
| 558 size_t index, | |
| 559 DicomDirWriter& dicomDir, | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
560 const std::string& dicomDirFolder, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
561 bool transcode, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
562 DicomTransferSyntax transferSyntax) const |
| 2632 | 563 { |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
564 ApplyInternal(writer, context, index, &dicomDir, dicomDirFolder, transcode, transferSyntax); |
| 2632 | 565 } |
| 566 | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
567 // "archive" flavor (without DICOMDIR) |
| 2632 | 568 void Apply(HierarchicalZipWriter& writer, |
| 569 ServerContext& context, | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
570 size_t index, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
571 bool transcode, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
572 DicomTransferSyntax transferSyntax) const |
| 2632 | 573 { |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
574 ApplyInternal(writer, context, index, NULL, "", transcode, transferSyntax); |
| 2632 | 575 } |
| 576 | |
| 577 void AddOpenDirectory(const std::string& filename) | |
| 578 { | |
| 579 commands_.push_back(new Command(Type_OpenDirectory, filename)); | |
| 580 } | |
| 581 | |
| 582 void AddCloseDirectory() | |
| 583 { | |
| 584 commands_.push_back(new Command(Type_CloseDirectory)); | |
| 585 } | |
| 586 | |
| 587 void AddWriteInstance(const std::string& filename, | |
| 588 const std::string& instanceId, | |
| 589 const FileInfo& info) | |
| 590 { | |
| 591 commands_.push_back(new Command(Type_WriteInstance, filename, instanceId, info)); | |
| 592 instancesCount_ ++; | |
| 593 uncompressedSize_ += info.GetUncompressedSize(); | |
| 594 } | |
| 595 | |
| 596 bool IsZip64() const | |
| 597 { | |
| 598 return IsZip64Required(GetUncompressedSize(), GetInstancesCount()); | |
| 599 } | |
| 600 }; | |
| 601 | |
| 602 | |
| 603 | |
| 604 class ArchiveJob::ArchiveIndexVisitor : public IArchiveVisitor | |
| 605 { | |
| 606 private: | |
| 607 ZipCommands& commands_; | |
| 608 ServerContext& context_; | |
| 609 char instanceFormat_[24]; | |
| 610 unsigned int counter_; | |
| 611 | |
| 612 static std::string GetTag(const DicomMap& tags, | |
| 613 const DicomTag& tag) | |
| 614 { | |
| 615 const DicomValue* v = tags.TestAndGetValue(tag); | |
| 616 if (v != NULL && | |
| 617 !v->IsBinary() && | |
| 618 !v->IsNull()) | |
| 619 { | |
| 620 return v->GetContent(); | |
| 621 } | |
| 622 else | |
| 623 { | |
| 624 return ""; | |
| 625 } | |
| 626 } | |
| 627 | |
| 628 public: | |
| 629 ArchiveIndexVisitor(ZipCommands& commands, | |
| 630 ServerContext& context) : | |
| 631 commands_(commands), | |
| 632 context_(context), | |
| 633 counter_(0) | |
| 634 { | |
| 635 if (commands.GetSize() != 0) | |
| 636 { | |
| 637 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 638 } | |
| 639 | |
| 640 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%%08d.dcm"); | |
| 641 } | |
| 642 | |
| 643 virtual void Open(ResourceType level, | |
| 644 const std::string& publicId) | |
| 645 { | |
| 646 std::string path; | |
| 647 | |
| 648 DicomMap tags; | |
| 649 if (context_.GetIndex().GetMainDicomTags(tags, publicId, level, level)) | |
| 650 { | |
| 651 switch (level) | |
| 652 { | |
| 653 case ResourceType_Patient: | |
| 654 path = GetTag(tags, DICOM_TAG_PATIENT_ID) + " " + GetTag(tags, DICOM_TAG_PATIENT_NAME); | |
| 655 break; | |
| 656 | |
| 657 case ResourceType_Study: | |
| 658 path = GetTag(tags, DICOM_TAG_ACCESSION_NUMBER) + " " + GetTag(tags, DICOM_TAG_STUDY_DESCRIPTION); | |
| 659 break; | |
| 660 | |
| 661 case ResourceType_Series: | |
| 662 { | |
| 663 std::string modality = GetTag(tags, DICOM_TAG_MODALITY); | |
| 664 path = modality + " " + GetTag(tags, DICOM_TAG_SERIES_DESCRIPTION); | |
| 665 | |
| 666 if (modality.size() == 0) | |
| 667 { | |
| 668 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%%08d.dcm"); | |
| 669 } | |
| 670 else if (modality.size() == 1) | |
| 671 { | |
| 672 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%c%%07d.dcm", | |
| 673 toupper(modality[0])); | |
| 674 } | |
| 675 else if (modality.size() >= 2) | |
| 676 { | |
| 677 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%c%c%%06d.dcm", | |
| 678 toupper(modality[0]), toupper(modality[1])); | |
| 679 } | |
| 680 | |
| 681 counter_ = 0; | |
| 682 | |
| 683 break; | |
| 684 } | |
| 685 | |
| 686 default: | |
| 687 throw OrthancException(ErrorCode_InternalError); | |
| 688 } | |
| 689 } | |
| 690 | |
| 691 path = Toolbox::StripSpaces(Toolbox::ConvertToAscii(path)); | |
| 692 | |
| 693 if (path.empty()) | |
| 694 { | |
| 695 path = std::string("Unknown ") + EnumerationToString(level); | |
| 696 } | |
| 697 | |
| 698 commands_.AddOpenDirectory(path.c_str()); | |
| 699 } | |
| 700 | |
| 701 virtual void Close() | |
| 702 { | |
| 703 commands_.AddCloseDirectory(); | |
| 704 } | |
| 705 | |
| 706 virtual void AddInstance(const std::string& instanceId, | |
| 707 const FileInfo& dicom) | |
| 708 { | |
| 709 char filename[24]; | |
| 710 snprintf(filename, sizeof(filename) - 1, instanceFormat_, counter_); | |
| 711 counter_ ++; | |
| 712 | |
| 713 commands_.AddWriteInstance(filename, instanceId, dicom); | |
| 714 } | |
| 715 }; | |
| 716 | |
| 717 | |
| 718 class ArchiveJob::MediaIndexVisitor : public IArchiveVisitor | |
| 719 { | |
| 720 private: | |
| 721 ZipCommands& commands_; | |
| 722 ServerContext& context_; | |
| 723 unsigned int counter_; | |
| 724 | |
| 725 public: | |
| 726 MediaIndexVisitor(ZipCommands& commands, | |
| 727 ServerContext& context) : | |
| 728 commands_(commands), | |
| 729 context_(context), | |
| 730 counter_(0) | |
| 731 { | |
| 732 } | |
| 733 | |
| 734 virtual void Open(ResourceType level, | |
| 735 const std::string& publicId) | |
| 736 { | |
| 737 } | |
| 738 | |
| 739 virtual void Close() | |
| 740 { | |
| 741 } | |
| 742 | |
| 743 virtual void AddInstance(const std::string& instanceId, | |
| 744 const FileInfo& dicom) | |
| 745 { | |
| 746 // "DICOM restricts the filenames on DICOM media to 8 | |
| 747 // characters (some systems wrongly use 8.3, but this does not | |
| 748 // conform to the standard)." | |
| 749 std::string filename = "IM" + boost::lexical_cast<std::string>(counter_); | |
| 750 commands_.AddWriteInstance(filename, instanceId, dicom); | |
| 751 | |
| 752 counter_ ++; | |
| 753 } | |
| 754 }; | |
| 755 | |
| 756 | |
| 757 class ArchiveJob::ZipWriterIterator : public boost::noncopyable | |
| 758 { | |
| 759 private: | |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
760 TemporaryFile& target_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
761 ServerContext& context_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
762 ZipCommands commands_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
763 std::unique_ptr<HierarchicalZipWriter> zip_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
764 std::unique_ptr<DicomDirWriter> dicomDir_; |
|
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
765 bool isMedia_; |
| 2632 | 766 |
| 767 public: | |
| 768 ZipWriterIterator(TemporaryFile& target, | |
| 769 ServerContext& context, | |
| 770 ArchiveIndex& archive, | |
| 771 bool isMedia, | |
| 772 bool enableExtendedSopClass) : | |
| 773 target_(target), | |
| 774 context_(context), | |
| 775 isMedia_(isMedia) | |
| 776 { | |
| 777 if (isMedia) | |
| 778 { | |
| 779 MediaIndexVisitor visitor(commands_, context); | |
| 780 archive.Expand(context.GetIndex()); | |
| 781 | |
| 782 commands_.AddOpenDirectory(MEDIA_IMAGES_FOLDER); | |
| 783 archive.Apply(visitor); | |
| 784 commands_.AddCloseDirectory(); | |
| 785 | |
| 786 dicomDir_.reset(new DicomDirWriter); | |
| 787 dicomDir_->EnableExtendedSopClass(enableExtendedSopClass); | |
| 788 } | |
| 789 else | |
| 790 { | |
| 791 ArchiveIndexVisitor visitor(commands_, context); | |
| 792 archive.Expand(context.GetIndex()); | |
| 793 archive.Apply(visitor); | |
| 794 } | |
| 795 | |
| 796 zip_.reset(new HierarchicalZipWriter(target.GetPath().c_str())); | |
| 797 zip_->SetZip64(commands_.IsZip64()); | |
| 798 } | |
| 799 | |
| 800 size_t GetStepsCount() const | |
| 801 { | |
| 802 return commands_.GetSize() + 1; | |
| 803 } | |
| 804 | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
805 void RunStep(size_t index, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
806 bool transcode, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
807 DicomTransferSyntax transferSyntax) |
| 2632 | 808 { |
| 809 if (index > commands_.GetSize()) | |
| 810 { | |
| 811 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 812 } | |
| 813 else if (index == commands_.GetSize()) | |
| 814 { | |
| 815 // Last step: Add the DICOMDIR | |
| 816 if (isMedia_) | |
| 817 { | |
| 818 assert(dicomDir_.get() != NULL); | |
| 819 std::string s; | |
| 820 dicomDir_->Encode(s); | |
| 821 | |
| 822 zip_->OpenFile("DICOMDIR"); | |
| 823 zip_->Write(s); | |
| 824 } | |
| 825 } | |
| 826 else | |
| 827 { | |
| 828 if (isMedia_) | |
| 829 { | |
| 830 assert(dicomDir_.get() != NULL); | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
831 commands_.Apply(*zip_, context_, index, *dicomDir_, |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
832 MEDIA_IMAGES_FOLDER, transcode, transferSyntax); |
| 2632 | 833 } |
| 834 else | |
| 835 { | |
| 836 assert(dicomDir_.get() == NULL); | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
837 commands_.Apply(*zip_, context_, index, transcode, transferSyntax); |
| 2632 | 838 } |
| 839 } | |
| 840 } | |
| 841 | |
| 842 unsigned int GetInstancesCount() const | |
| 843 { | |
| 844 return commands_.GetInstancesCount(); | |
| 845 } | |
| 846 | |
| 847 uint64_t GetUncompressedSize() const | |
| 848 { | |
| 849 return commands_.GetUncompressedSize(); | |
| 850 } | |
| 851 }; | |
| 852 | |
| 853 | |
| 2966 | 854 ArchiveJob::ArchiveJob(ServerContext& context, |
| 2632 | 855 bool isMedia, |
| 856 bool enableExtendedSopClass) : | |
| 857 context_(context), | |
| 858 archive_(new ArchiveIndex(ResourceType_Patient)), // root | |
| 859 isMedia_(isMedia), | |
| 860 enableExtendedSopClass_(enableExtendedSopClass), | |
| 861 currentStep_(0), | |
| 862 instancesCount_(0), | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
863 uncompressedSize_(0), |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
864 transcode_(false), |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
865 transferSyntax_(DicomTransferSyntax_LittleEndianImplicit) |
| 2632 | 866 { |
| 2966 | 867 } |
| 868 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
869 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
870 ArchiveJob::~ArchiveJob() |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
871 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
872 if (!mediaArchiveId_.empty()) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
873 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
874 context_.GetMediaArchive().Remove(mediaArchiveId_); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
875 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
876 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
877 |
| 2966 | 878 |
| 879 void ArchiveJob::SetSynchronousTarget(boost::shared_ptr<TemporaryFile>& target) | |
| 880 { | |
| 881 if (target.get() == NULL) | |
| 2632 | 882 { |
| 883 throw OrthancException(ErrorCode_NullPointer); | |
| 884 } | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
885 else if (writer_.get() != NULL || // Already started |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
886 synchronousTarget_.get() != NULL || |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
887 asynchronousTarget_.get() != NULL) |
| 2966 | 888 { |
| 889 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 890 } | |
| 891 else | |
| 892 { | |
| 893 synchronousTarget_ = target; | |
| 894 } | |
| 2632 | 895 } |
| 896 | |
| 897 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
898 void ArchiveJob::SetDescription(const std::string& description) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
899 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
900 if (writer_.get() != NULL) // Already started |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
901 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
902 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
903 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
904 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
905 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
906 description_ = description; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
907 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
908 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
909 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
910 |
| 2632 | 911 void ArchiveJob::AddResource(const std::string& publicId) |
| 912 { | |
| 913 if (writer_.get() != NULL) // Already started | |
| 914 { | |
| 915 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 916 } | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
917 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
918 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
919 ResourceIdentifiers resource(context_.GetIndex(), publicId); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
920 archive_->Add(context_.GetIndex(), resource); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
921 } |
| 2632 | 922 } |
| 923 | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
924 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
925 void ArchiveJob::SetTranscode(DicomTransferSyntax transferSyntax) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
926 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
927 if (writer_.get() != NULL) // Already started |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
928 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
929 throw OrthancException(ErrorCode_BadSequenceOfCalls); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
930 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
931 else |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
932 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
933 transcode_ = true; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
934 transferSyntax_ = transferSyntax; |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
935 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
936 } |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
937 |
| 2632 | 938 |
|
2812
ea7aea6f6a95
improved naming of methods in IJob
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2730
diff
changeset
|
939 void ArchiveJob::Reset() |
| 2632 | 940 { |
| 2955 | 941 throw OrthancException(ErrorCode_BadSequenceOfCalls, |
| 942 "Cannot resubmit the creation of an archive"); | |
| 2632 | 943 } |
| 944 | |
| 945 | |
| 946 void ArchiveJob::Start() | |
| 947 { | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
948 TemporaryFile* target = NULL; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
949 |
| 2966 | 950 if (synchronousTarget_.get() == NULL) |
| 951 { | |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
952 { |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
953 OrthancConfiguration::ReaderLock lock; |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
954 asynchronousTarget_.reset(lock.GetConfiguration().CreateTemporaryFile()); |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
955 } |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
956 |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
957 target = asynchronousTarget_.get(); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
958 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
959 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
960 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
961 target = synchronousTarget_.get(); |
| 2966 | 962 } |
|
3181
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
963 |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
964 assert(target != NULL); |
|
6fd38327e777
Fix issue #130 (Orthanc failed to start when /tmp partition was full)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3095
diff
changeset
|
965 target->Touch(); // Make sure we can write to the temporary file |
| 2966 | 966 |
| 2632 | 967 if (writer_.get() != NULL) |
| 968 { | |
| 969 throw OrthancException(ErrorCode_BadSequenceOfCalls); | |
| 970 } | |
| 971 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
972 writer_.reset(new ZipWriterIterator(*target, context_, *archive_, |
| 2632 | 973 isMedia_, enableExtendedSopClass_)); |
| 974 | |
| 975 instancesCount_ = writer_->GetInstancesCount(); | |
| 976 uncompressedSize_ = writer_->GetUncompressedSize(); | |
| 977 } | |
| 978 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
979 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
980 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
981 namespace |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
982 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
983 class DynamicTemporaryFile : public IDynamicObject |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
984 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
985 private: |
|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
986 std::unique_ptr<TemporaryFile> file_; |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
987 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
988 public: |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
989 DynamicTemporaryFile(TemporaryFile* f) : file_(f) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
990 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
991 if (f == NULL) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
992 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
993 throw OrthancException(ErrorCode_NullPointer); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
994 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
995 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
996 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
997 const TemporaryFile& GetFile() const |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
998 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
999 assert(file_.get() != NULL); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1000 return *file_; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1001 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1002 }; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1003 } |
| 2632 | 1004 |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1005 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1006 void ArchiveJob::FinalizeTarget() |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1007 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1008 writer_.reset(); // Flush all the results |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1009 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1010 if (asynchronousTarget_.get() != NULL) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1011 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1012 // Asynchronous behavior: Move the resulting file into the media archive |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1013 mediaArchiveId_ = context_.GetMediaArchive().Add( |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1014 new DynamicTemporaryFile(asynchronousTarget_.release())); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1015 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1016 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1017 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1018 |
|
3658
2d90dd30858c
providing job ID to the IJob::Step() methods
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3640
diff
changeset
|
1019 JobStepResult ArchiveJob::Step(const std::string& jobId) |
| 2632 | 1020 { |
| 1021 assert(writer_.get() != NULL); | |
| 1022 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1023 if (synchronousTarget_.get() != NULL && |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1024 synchronousTarget_.unique()) |
| 2632 | 1025 { |
| 1026 LOG(WARNING) << "A client has disconnected while creating an archive"; | |
|
3240
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3181
diff
changeset
|
1027 return JobStepResult::Failure(ErrorCode_NetworkProtocol, |
|
e44e0127e553
Fix issue #134 (/patient/modify gives 500, should really be 400)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3181
diff
changeset
|
1028 "A client has disconnected while creating an archive"); |
| 2632 | 1029 } |
| 1030 | |
| 1031 if (writer_->GetStepsCount() == 0) | |
| 1032 { | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1033 FinalizeTarget(); |
| 2632 | 1034 return JobStepResult::Success(); |
| 1035 } | |
| 1036 else | |
| 1037 { | |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1038 writer_->RunStep(currentStep_, transcode_, transferSyntax_); |
| 2632 | 1039 |
| 1040 currentStep_ ++; | |
| 1041 | |
| 1042 if (currentStep_ == writer_->GetStepsCount()) | |
| 1043 { | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1044 FinalizeTarget(); |
| 2632 | 1045 return JobStepResult::Success(); |
| 1046 } | |
| 1047 else | |
| 1048 { | |
| 1049 return JobStepResult::Continue(); | |
| 1050 } | |
| 1051 } | |
| 1052 } | |
| 1053 | |
| 1054 | |
| 1055 float ArchiveJob::GetProgress() | |
| 1056 { | |
| 1057 if (writer_.get() == NULL || | |
| 1058 writer_->GetStepsCount() == 0) | |
| 1059 { | |
| 1060 return 1; | |
| 1061 } | |
| 1062 else | |
| 1063 { | |
| 1064 return (static_cast<float>(currentStep_) / | |
| 1065 static_cast<float>(writer_->GetStepsCount() - 1)); | |
| 1066 } | |
| 1067 } | |
| 1068 | |
| 1069 | |
| 1070 void ArchiveJob::GetJobType(std::string& target) | |
| 1071 { | |
| 1072 if (isMedia_) | |
| 1073 { | |
| 1074 target = "Media"; | |
| 1075 } | |
| 1076 else | |
| 1077 { | |
| 1078 target = "Archive"; | |
| 1079 } | |
| 1080 } | |
| 1081 | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1082 |
| 2632 | 1083 void ArchiveJob::GetPublicContent(Json::Value& value) |
| 1084 { | |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1085 value = Json::objectValue; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1086 value[KEY_DESCRIPTION] = description_; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1087 value[KEY_INSTANCES_COUNT] = instancesCount_; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1088 value[KEY_UNCOMPRESSED_SIZE_MB] = |
| 2643 | 1089 static_cast<unsigned int>(uncompressedSize_ / MEGA_BYTES); |
|
3913
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1090 |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1091 if (transcode_) |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1092 { |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1093 value[KEY_TRANSCODE] = GetTransferSyntaxUid(transferSyntax_); |
|
6ddad3e0b569
transcoding ZIP archive and media
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3713
diff
changeset
|
1094 } |
| 2632 | 1095 } |
|
2976
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1096 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1097 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1098 bool ArchiveJob::GetOutput(std::string& output, |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1099 MimeType& mime, |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1100 const std::string& key) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1101 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1102 if (key == "archive" && |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1103 !mediaArchiveId_.empty()) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1104 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1105 SharedArchive::Accessor accessor(context_.GetMediaArchive(), mediaArchiveId_); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1106 |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1107 if (accessor.IsValid()) |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1108 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1109 const DynamicTemporaryFile& f = dynamic_cast<DynamicTemporaryFile&>(accessor.GetItem()); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1110 f.GetFile().Read(output); |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1111 mime = MimeType_Zip; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1112 return true; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1113 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1114 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1115 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1116 return false; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1117 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1118 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1119 else |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1120 { |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1121 return false; |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1122 } |
|
cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
2966
diff
changeset
|
1123 } |
| 2632 | 1124 } |