orthanc: OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp annotate

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp @ 4797:4e765c18ace7 storage-cache

enable using multiple threads to load instances when generating zip archive/media

author	Alain Mazy <am@osimis.io>
date	Thu, 07 Oct 2021 13:31:36 +0200
parents	b3957ddd88f1
children	70d2a97ca8cb 7053502fbf97

rev	line source
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1847 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1121 diff changeset	4 * Department, University Hospital of Liege, Belgium
4437 d9473bd5ed43 upgrade to year 2021 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4417 diff changeset	5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * In addition, as a special exception, the copyright holders of this
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * This program is distributed in the hope that it will be useful, but
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
831 84513f2ee1f3 pch for unit tests and server Sebastien Jodogne <s.jodogne@gmail.com> parents: 824 diff changeset	34 #include "../PrecompiledHeadersServer.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "OrthancRestApi.h"
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	37 #include "../../../OrthancFramework/Sources/Compression/ZipWriter.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	38 #include "../../../OrthancFramework/Sources/HttpServer/FilesystemHttpSender.h"
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	39 #include "../../../OrthancFramework/Sources/Logging.h"
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	40 #include "../../../OrthancFramework/Sources/OrthancException.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	41 #include "../../../OrthancFramework/Sources/SerializationToolbox.h"
3181 6fd38327e777 Fix issue #130 (Orthanc failed to start when /tmp partition was full) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3161 diff changeset	42 #include "../OrthancConfiguration.h"
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	43 #include "../ServerContext.h"
2632 2406ae891747 ArchiveJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	44 #include "../ServerJobs/ArchiveJob.h"
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	46 #include <boost/filesystem/fstream.hpp>
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	47
3095 beeeb6096f27 removing dependencies upon ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	48
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	51 static const char* const KEY_RESOURCES = "Resources";
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	52 static const char* const KEY_EXTENDED = "Extended";
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	53 static const char* const KEY_TRANSCODE = "Transcode";
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	54
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	55 static const char* const CONFIG_LOADER_THREADS = "ZipLoaderThreads";
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	56
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	57 static void AddResourcesOfInterestFromArray(ArchiveJob& job,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	58 const Json::Value& resources)
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	59 {
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	60 if (resources.type() != Json::arrayValue)
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	61 {
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	62 throw OrthancException(ErrorCode_BadFileFormat,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	63 "Expected a list of strings (Orthanc identifiers)");
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	64 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	65
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	66 for (Json::Value::ArrayIndex i = 0; i < resources.size(); i++)
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	67 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	68 if (resources[i].type() != Json::stringValue)
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	69 {
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	70 throw OrthancException(ErrorCode_BadFileFormat,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	71 "Expected a list of strings (Orthanc identifiers)");
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	72 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	73 else
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	74 {
2632 2406ae891747 ArchiveJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	75 job.AddResource(resources[i].asString());
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	76 }
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	77 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	78 }
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	79
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	80
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	81 static void AddResourcesOfInterest(ArchiveJob& job /* inout */,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	82 const Json::Value& body /* in */)
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	83 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	84 if (body.type() == Json::arrayValue)
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	85 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	86 AddResourcesOfInterestFromArray(job, body);
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	87 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	88 else if (body.type() == Json::objectValue)
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	89 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	90 if (body.isMember(KEY_RESOURCES))
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	91 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	92 AddResourcesOfInterestFromArray(job, body[KEY_RESOURCES]);
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	93 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	94 else
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	95 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	96 throw OrthancException(ErrorCode_BadFileFormat,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	97 "Missing field " + std::string(KEY_RESOURCES) +
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	98 " in the JSON body");
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	99 }
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	100 }
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	101 else
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	102 {
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	103 throw OrthancException(ErrorCode_BadFileFormat);
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	104 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	105 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	106
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	107
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	108 static DicomTransferSyntax GetTransferSyntax(const std::string& value)
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	109 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	110 DicomTransferSyntax syntax;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	111 if (LookupTransferSyntax(syntax, value))
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	112 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	113 return syntax;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	114 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	115 else
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	116 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	117 throw OrthancException(ErrorCode_ParameterOutOfRange,
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	118 "Unknown transfer syntax: " + value);
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	119 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	120 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	121
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	122
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	123 static void GetJobParameters(bool& synchronous, /* out */
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	124 bool& extended, /* out */
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	125 bool& transcode, /* out */
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	126 DicomTransferSyntax& syntax, /* out */
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	127 int& priority, /* out */
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	128 unsigned int& loaderThreads, /* out */
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	129 const Json::Value& body, /* in */
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	130 const bool defaultExtended /* in */)
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	131 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	132 synchronous = OrthancRestApi::IsSynchronousJobRequest
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	133 (true /* synchronous by default */, body);
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	134
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	135 priority = OrthancRestApi::GetJobRequestPriority(body);
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	136
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	137 if (body.type() == Json::objectValue &&
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	138 body.isMember(KEY_EXTENDED))
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	139 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	140 extended = SerializationToolbox::ReadBoolean(body, KEY_EXTENDED);
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	141 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	142 else
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	143 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	144 extended = defaultExtended;
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	145 }
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	146
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	147 if (body.type() == Json::objectValue &&
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	148 body.isMember(KEY_TRANSCODE))
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	149 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	150 transcode = true;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	151 syntax = GetTransferSyntax(SerializationToolbox::ReadString(body, KEY_TRANSCODE));
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	152 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	153 else
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	154 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	155 transcode = false;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	156 }
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	157
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	158 {
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	159 OrthancConfiguration::ReaderLock lock;
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	160 loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0); // New in Orthanc 1.9.8
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	161 }
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	162
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	163 }
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	164
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	165
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	166 namespace
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	167 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	168 class SynchronousZipChunk : public IDynamicObject
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	169 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	170 private:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	171 std::string chunk_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	172 bool done_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	173
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	174 explicit SynchronousZipChunk(bool done) :
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	175 done_(done)
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	176 {
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	177 }
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	178
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	179 public:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	180 static SynchronousZipChunk* CreateDone()
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	181 {
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	182 return new SynchronousZipChunk(true);
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	183 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	184
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	185 static SynchronousZipChunk* CreateChunk(const std::string& chunk)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	186 {
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	187 std::unique_ptr<SynchronousZipChunk> item(new SynchronousZipChunk(false));
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	188 item->chunk_ = chunk;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	189 return item.release();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	190 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	191
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	192 bool IsDone() const
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	193 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	194 return done_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	195 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	196
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	197 void SwapString(std::string& target)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	198 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	199 if (done_)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	200 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	201 throw OrthancException(ErrorCode_BadSequenceOfCalls);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	202 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	203 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	204 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	205 target.swap(chunk_);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	206 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	207 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	208 };
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	209
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	210
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	211 class SynchronousZipStream : public ZipWriter::IOutputStream
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	212 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	213 private:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	214 boost::shared_ptr<SharedMessageQueue> queue_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	215 uint64_t archiveSize_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	216
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	217 public:
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	218 explicit SynchronousZipStream(const boost::shared_ptr<SharedMessageQueue>& queue) :
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	219 queue_(queue),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	220 archiveSize_(0)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	221 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	222 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	223
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	224 virtual uint64_t GetArchiveSize() const ORTHANC_OVERRIDE
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	225 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	226 return archiveSize_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	227 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	228
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	229 virtual void Write(const std::string& chunk) ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	230 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	231 if (queue_.unique())
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	232 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	233 throw OrthancException(ErrorCode_NetworkProtocol,
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	234 "HTTP client has disconnected while creating an archive in synchronous mode");
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	235 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	236 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	237 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	238 queue_->Enqueue(SynchronousZipChunk::CreateChunk(chunk));
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	239 archiveSize_ += chunk.size();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	240 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	241 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	242
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	243 virtual void Close() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	244 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	245 queue_->Enqueue(SynchronousZipChunk::CreateDone());
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	246 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	247 };
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	248
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	249
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	250 class SynchronousZipSender : public IHttpStreamAnswer
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	251 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	252 private:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	253 ServerContext& context_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	254 std::string jobId_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	255 boost::shared_ptr<SharedMessageQueue> queue_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	256 std::string filename_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	257 bool done_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	258 std::string chunk_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	259
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	260 public:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	261 SynchronousZipSender(ServerContext& context,
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	262 const std::string& jobId,
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	263 const boost::shared_ptr<SharedMessageQueue>& queue,
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	264 const std::string& filename) :
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	265 context_(context),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	266 jobId_(jobId),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	267 queue_(queue),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	268 filename_(filename),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	269 done_(false)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	270 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	271 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	272
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	273 virtual HttpCompression SetupHttpCompression(bool gzipAllowed,
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	274 bool deflateAllowed) ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	275 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	276 // This function is not called by HttpOutput::AnswerWithoutBuffering()
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	277 throw OrthancException(ErrorCode_InternalError);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	278 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	279
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	280 virtual bool HasContentFilename(std::string& filename) ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	281 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	282 filename = filename_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	283 return true;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	284 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	285
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	286 virtual std::string GetContentType() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	287 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	288 return EnumerationToString(MimeType_Zip);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	289 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	290
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	291 virtual uint64_t GetContentLength() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	292 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	293 throw OrthancException(ErrorCode_InternalError);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	294 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	295
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	296 virtual bool ReadNextChunk() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	297 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	298 for (;;)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	299 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	300 std::unique_ptr<IDynamicObject> obj(queue_->Dequeue(100));
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	301
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	302 if (obj.get() == NULL)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	303 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	304 // Check that the job is still active, which indicates
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	305 // that more data might still be returned
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	306 JobState state;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	307 if (context_.GetJobsEngine().GetRegistry().GetState(state, jobId_) &&
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	308 (state == JobState_Pending \|\|
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	309 state == JobState_Running \|\|
13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	310 state == JobState_Success))
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	311 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	312 continue;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	313 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	314 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	315 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	316 return false;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	317 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	318 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	319 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	320 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	321 SynchronousZipChunk& item = dynamic_cast<SynchronousZipChunk&>(*obj);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	322 if (item.IsDone())
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	323 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	324 done_ = true;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	325 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	326 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	327 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	328 item.SwapString(chunk_);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	329 done_ = false;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	330 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	331
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	332 return !done_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	333 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	334 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	335 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	336
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	337 virtual const char* GetChunkContent() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	338 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	339 if (done_)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	340 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	341 throw OrthancException(ErrorCode_InternalError);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	342 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	343 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	344 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	345 return (chunk_.empty() ? NULL : chunk_.c_str());
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	346 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	347 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	348
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	349 virtual size_t GetChunkSize() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	350 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	351 if (done_)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	352 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	353 throw OrthancException(ErrorCode_InternalError);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	354 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	355 else
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	356 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	357 return chunk_.size();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	358 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	359 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	360 };
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	361
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	362
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	363 class SynchronousTemporaryStream : public ZipWriter::IOutputStream
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	364 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	365 private:
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	366 boost::shared_ptr<TemporaryFile> temp_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	367 boost::filesystem::ofstream file_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	368 uint64_t archiveSize_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	369
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	370 public:
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	371 explicit SynchronousTemporaryStream(const boost::shared_ptr<TemporaryFile>& temp) :
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	372 temp_(temp),
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	373 archiveSize_(0)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	374 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	375 file_.open(temp_->GetPath(), std::ofstream::out \| std::ofstream::binary);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	376 if (!file_.good())
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	377 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	378 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	379 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	380 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	381
4690 13efc0967cea cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4674 diff changeset	382 virtual uint64_t GetArchiveSize() const ORTHANC_OVERRIDE
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	383 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	384 return archiveSize_;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	385 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	386
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	387 virtual void Write(const std::string& chunk) ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	388 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	389 if (!chunk.empty())
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	390 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	391 try
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	392 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	393 file_.write(chunk.c_str(), chunk.size());
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	394
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	395 if (!file_.good())
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	396 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	397 file_.close();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	398 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	399 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	400 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	401 catch (boost::filesystem::filesystem_error&)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	402 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	403 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	404 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	405 catch (...) // To catch "std::system_error&" in C++11
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	406 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	407 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	408 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	409 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	410
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	411 archiveSize_ += chunk.size();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	412 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	413
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	414 virtual void Close() ORTHANC_OVERRIDE
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	415 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	416 try
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	417 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	418 file_.close();
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	419 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	420 catch (boost::filesystem::filesystem_error&)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	421 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	422 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	423 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	424 catch (...) // To catch "std::system_error&" in C++11
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	425 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	426 throw OrthancException(ErrorCode_CannotWriteFile);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	427 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	428 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	429 };
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	430 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	431
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	432
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	433 static void SubmitJob(RestApiOutput& output,
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	434 ServerContext& context,
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	435 std::unique_ptr<ArchiveJob>& job,
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	436 int priority,
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	437 bool synchronous,
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	438 const std::string& filename)
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	439 {
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	440 if (job.get() == NULL)
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	441 {
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	442 throw OrthancException(ErrorCode_NullPointer);
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	443 }
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	444
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	445 job->SetDescription("REST API");
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	446
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	447 if (synchronous)
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	448 {
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	449 bool streaming;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	450
3181 6fd38327e777 Fix issue #130 (Orthanc failed to start when /tmp partition was full) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3161 diff changeset	451 {
6fd38327e777 Fix issue #130 (Orthanc failed to start when /tmp partition was full) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3161 diff changeset	452 OrthancConfiguration::ReaderLock lock;
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	453 streaming = lock.GetConfiguration().GetBooleanParameter("SynchronousZipStream", true); // New in Orthanc 1.9.4
3181 6fd38327e777 Fix issue #130 (Orthanc failed to start when /tmp partition was full) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3161 diff changeset	454 }
6fd38327e777 Fix issue #130 (Orthanc failed to start when /tmp partition was full) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3161 diff changeset	455
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	456 if (streaming)
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	457 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	458 LOG(INFO) << "Streaming a ZIP archive";
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	459 boost::shared_ptr<SharedMessageQueue> queue(new SharedMessageQueue);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	460
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	461 job->AcquireSynchronousTarget(new SynchronousZipStream(queue));
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	462
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	463 std::string jobId;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	464 context.GetJobsEngine().GetRegistry().Submit(jobId, job.release(), priority);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	465
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	466 SynchronousZipSender sender(context, jobId, queue, filename);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	467 output.AnswerWithoutBuffering(sender);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	468
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	469 // If we reach this line, this means that
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	470 // "SynchronousZipSender::ReadNextChunk()" has returned "false"
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	471 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	472 else
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	473 {
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	474 // This was the only behavior in Orthanc <= 1.9.3
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	475 LOG(INFO) << "Not streaming a ZIP archive (use of a temporary file)";
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	476 boost::shared_ptr<TemporaryFile> tmp;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	477
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	478 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	479 OrthancConfiguration::ReaderLock lock;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	480 tmp.reset(lock.GetConfiguration().CreateTemporaryFile());
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	481 }
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	482
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	483 job->AcquireSynchronousTarget(new SynchronousTemporaryStream(tmp));
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	484
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	485 Json::Value publicContent;
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	486 context.GetJobsEngine().GetRegistry().SubmitAndWait
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	487 (publicContent, job.release(), priority);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	488
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	489 {
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	490 // The archive is now created: Prepare the sending of the ZIP file
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	491 FilesystemHttpSender sender(tmp->GetPath(), MimeType_Zip);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	492 sender.SetContentFilename(filename);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	493
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	494 // Send the ZIP
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	495 output.AnswerStream(sender);
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	496 }
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	497 }
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	498 }
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	499 else
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	500 {
2976 cb5d75143da0 Asynchronous generation of ZIP archives and DICOM medias Sebastien Jodogne <s.jodogne@gmail.com> parents: 2970 diff changeset	501 OrthancRestApi::SubmitGenericJob(output, context, job.release(), false, priority);
2969 2c16c29b287d preparing for asynchronous generation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 2966 diff changeset	502 }
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	503 }
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	504
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	505
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	506 static void DocumentPostArguments(RestApiPostCall& call,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	507 bool isMedia,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	508 bool defaultExtended)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	509 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	510 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	511 .SetRequestField("Synchronous", RestApiCallDocumentation::Type_Boolean,
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	512 "If `true`, create the archive in synchronous mode, which means that the HTTP answer will directly "
cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	513 "contain the ZIP file. This is the default, easy behavior. However, if global configuration option "
4751 b3957ddd88f1 typos Sebastien Jodogne <s.jodogne@gmail.com> parents: 4690 diff changeset	514 "\"SynchronousZipStream\" is set to \"false\", asynchronous transfers should be preferred for "
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	515 "large amount of data, as the creation of the temporary file might lead to network timeouts.", false)
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	516 .SetRequestField("Asynchronous", RestApiCallDocumentation::Type_Boolean,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	517 "If `true`, create the archive in asynchronous mode, which means that a job is submitted to create "
4674 cdab941fe17d ZIP archive/media generated in synchronous mode are now streamed by default Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	518 "the archive in background.", false)
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	519 .SetRequestField(KEY_TRANSCODE, RestApiCallDocumentation::Type_String,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	520 "If present, the DICOM files in the archive will be transcoded to the provided "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	521 "transfer syntax: https://book.orthanc-server.com/faq/transcoding.html", false)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	522 .SetRequestField("Priority", RestApiCallDocumentation::Type_Number,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	523 "In asynchronous mode, the priority of the job. The lower the value, the higher the priority.", false)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	524 .AddAnswerType(MimeType_Zip, "In synchronous mode, the ZIP file containing the archive")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	525 .AddAnswerType(MimeType_Json, "In asynchronous mode, information about the job that has been submitted to "
4417 a4518adede59 openapi for plugins and jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	526 "generate the archive: https://book.orthanc-server.com/users/advanced-rest.html#jobs")
a4518adede59 openapi for plugins and jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	527 .SetAnswerField("ID", RestApiCallDocumentation::Type_String, "Identifier of the job")
a4518adede59 openapi for plugins and jobs Sebastien Jodogne <s.jodogne@gmail.com> parents: 4416 diff changeset	528 .SetAnswerField("Path", RestApiCallDocumentation::Type_String, "Path to access the job in the REST API");
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	529
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	530 if (isMedia)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	531 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	532 call.GetDocumentation().SetRequestField(
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	533 KEY_EXTENDED, RestApiCallDocumentation::Type_Boolean, "If `true`, will include additional "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	534 "tags such as `SeriesDescription`, leading to a so-called extended DICOMDIR. Default value is " +
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	535 std::string(defaultExtended ? "`true`" : "`false`") + ".", false);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	536 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	537 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	538
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	539
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	540 template <bool IS_MEDIA,
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	541 bool DEFAULT_IS_EXTENDED /* only makes sense for media (i.e. not ZIP archives) */ >
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	542 static void CreateBatch(RestApiPostCall& call)
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	543 {
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	544 if (call.IsDocumentation())
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	545 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	546 DocumentPostArguments(call, IS_MEDIA, DEFAULT_IS_EXTENDED);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	547 std::string m = (IS_MEDIA ? "DICOMDIR media" : "ZIP archive");
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	548 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	549 .SetTag("System")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	550 .SetSummary("Create " + m)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	551 .SetDescription("Create a " + m + " containing the DICOM resources (patients, studies, series, or instances) "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	552 "whose Orthanc identifiers are provided in the body")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	553 .SetRequestField("Resources", RestApiCallDocumentation::Type_JsonListOfStrings,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	554 "The list of Orthanc identifiers of interest.", false);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	555 return;
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	556 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	557
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	558 ServerContext& context = OrthancRestApi::GetContext(call);
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	559
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	560 Json::Value body;
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	561 if (call.ParseJsonRequest(body))
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	562 {
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	563 bool synchronous, extended, transcode;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	564 DicomTransferSyntax transferSyntax;
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	565 int priority;
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	566 unsigned int loaderThreads;
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	567 GetJobParameters(synchronous, extended, transcode, transferSyntax,
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	568 priority, loaderThreads, body, DEFAULT_IS_EXTENDED);
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	569
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	570 std::unique_ptr<ArchiveJob> job(new ArchiveJob(context, IS_MEDIA, extended));
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	571 AddResourcesOfInterest(*job, body);
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	572
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	573 if (transcode)
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	574 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	575 job->SetTranscode(transferSyntax);
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	576 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	577
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	578 job->SetLoaderThreads(loaderThreads);
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	579
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	580 SubmitJob(call.GetOutput(), context, job, priority, synchronous, "Archive.zip");
2966 10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	581 }
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	582 else
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	583 {
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	584 throw OrthancException(ErrorCode_BadFileFormat,
10c610e80b15 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2908 diff changeset	585 "Expected a list of resources to archive in the body");
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	586 }
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	587 }
00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	588
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	589
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	590 template <bool IS_MEDIA>
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	591 static void CreateSingleGet(RestApiGetCall& call)
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	592 {
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	593 static const char* const TRANSCODE = "transcode";
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	594
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	595 if (call.IsDocumentation())
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	596 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	597 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	598 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	599 std::string m = (IS_MEDIA ? "DICOMDIR media" : "ZIP archive");
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	600 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	601 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	602 .SetSummary("Create " + m)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	603 .SetDescription("Synchronously create a " + m + " containing the DICOM " + r +
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	604 " whose Orthanc identifier is provided in the URL. This flavor is synchronous, "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	605 "which might not be desirable to archive large amount of data, as it might "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	606 "lead to network timeouts. Prefer the asynchronous version using `POST` method.")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	607 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest")
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	608 .SetHttpGetArgument(TRANSCODE, RestApiCallDocumentation::Type_String,
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	609 "If present, the DICOM files in the archive will be transcoded to the provided "
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	610 "transfer syntax: https://book.orthanc-server.com/faq/transcoding.html", false)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	611 .AddAnswerType(MimeType_Zip, "ZIP file containing the archive");
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	612 if (IS_MEDIA)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	613 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	614 call.GetDocumentation().SetHttpGetArgument(
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	615 "extended", RestApiCallDocumentation::Type_String,
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	616 "If present, will include additional tags such as `SeriesDescription`, leading to a so-called extended DICOMDIR", false);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	617 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	618 return;
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	619 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	620
2630 00327e989458 creating archives/medias is now a job Sebastien Jodogne <s.jodogne@gmail.com> parents: 2629 diff changeset	621 ServerContext& context = OrthancRestApi::GetContext(call);
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	622
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	623 std::string id = call.GetUriComponent("id", "");
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	624
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	625 bool extended;
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	626 if (IS_MEDIA)
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	627 {
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	628 extended = call.HasArgument("extended");
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	629 }
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	630 else
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	631 {
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	632 extended = false;
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	633 }
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	634
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	635 std::unique_ptr<ArchiveJob> job(new ArchiveJob(context, IS_MEDIA, extended));
2632 2406ae891747 ArchiveJob Sebastien Jodogne <s.jodogne@gmail.com> parents: 2630 diff changeset	636 job->AddResource(id);
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	637
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	638 if (call.HasArgument(TRANSCODE))
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	639 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	640 job->SetTranscode(GetTransferSyntax(call.GetArgument(TRANSCODE, "")));
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	641 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	642
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	643 {
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	644 OrthancConfiguration::ReaderLock lock;
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	645 unsigned int loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0); // New in Orthanc 1.9.8
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	646 job->SetLoaderThreads(loaderThreads);
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	647 }
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	648
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	649 SubmitJob(call.GetOutput(), context, job, 0 /* priority */,
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	650 true /* synchronous */, id + ".zip");
1778 776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	651 }
776573e592da create media refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1777 diff changeset	652
1774 784a6b92d2f1 start of refactoring the creation of archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 1623 diff changeset	653
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	654 template <bool IS_MEDIA>
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	655 static void CreateSinglePost(RestApiPostCall& call)
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	656 {
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	657 if (call.IsDocumentation())
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	658 {
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	659 DocumentPostArguments(call, IS_MEDIA, false /* not extended by default */);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	660 ResourceType t = StringToResourceType(call.GetFullUri()[0].c_str());
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	661 std::string r = GetResourceTypeText(t, false /* plural /, false / upper case */);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	662 std::string m = (IS_MEDIA ? "DICOMDIR media" : "ZIP archive");
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	663 call.GetDocumentation()
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	664 .SetTag(GetResourceTypeText(t, true /* plural /, true / upper case */))
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	665 .SetSummary("Create " + m)
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	666 .SetDescription("Create a " + m + " containing the DICOM " + r +
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	667 " whose Orthanc identifier is provided in the URL")
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	668 .SetUriArgument("id", "Orthanc identifier of the " + r + " of interest");
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	669 return;
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	670 }
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	671
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	672 ServerContext& context = OrthancRestApi::GetContext(call);
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	673
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	674 std::string id = call.GetUriComponent("id", "");
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	675
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	676 Json::Value body;
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	677 if (call.ParseJsonRequest(body))
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	678 {
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	679 bool synchronous, extended, transcode;
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	680 DicomTransferSyntax transferSyntax;
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	681 int priority;
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	682 unsigned int loaderThreads;
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	683 GetJobParameters(synchronous, extended, transcode, transferSyntax,
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	684 priority, loaderThreads, body, false /* by default, not extented */);
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	685
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	686 std::unique_ptr<ArchiveJob> job(new ArchiveJob(context, IS_MEDIA, extended));
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	687 job->AddResource(id);
3913 6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	688
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	689 if (transcode)
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	690 {
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	691 job->SetTranscode(transferSyntax);
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	692 }
6ddad3e0b569 transcoding ZIP archive and media Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	693
4797 4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	694 job->SetLoaderThreads(loaderThreads);
4e765c18ace7 enable using multiple threads to load instances when generating zip archive/media Alain Mazy <am@osimis.io> parents: 4751 diff changeset	695
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	696 SubmitJob(call.GetOutput(), context, job, priority, synchronous, id + ".zip");
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	697 }
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	698 else
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	699 {
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	700 throw OrthancException(ErrorCode_BadFileFormat);
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	701 }
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	702 }
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	703
d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	704
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 void OrthancRestApi::RegisterArchive()
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 {
4416 0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	707 Register("/patients/{id}/archive", CreateSingleGet<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	708 Register("/patients/{id}/archive", CreateSinglePost<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	709 Register("/patients/{id}/media", CreateSingleGet<true /* media */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	710 Register("/patients/{id}/media", CreateSinglePost<true /* media */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	711 Register("/series/{id}/archive", CreateSingleGet<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	712 Register("/series/{id}/archive", CreateSinglePost<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	713 Register("/series/{id}/media", CreateSingleGet<true /* media */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	714 Register("/series/{id}/media", CreateSinglePost<true /* media */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	715 Register("/studies/{id}/archive", CreateSingleGet<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	716 Register("/studies/{id}/archive", CreateSinglePost<false /* ZIP */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	717 Register("/studies/{id}/media", CreateSingleGet<true /* media */>);
0b27841950d5 openapi about creation of zip/media archives Sebastien Jodogne <s.jodogne@gmail.com> parents: 4045 diff changeset	718 Register("/studies/{id}/media", CreateSinglePost<true /* media */>);
2978 d0250d096acc cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 2976 diff changeset	719
2970 eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	720 Register("/tools/create-archive",
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	721 CreateBatch<false /* ZIP /, false / extended makes no sense in ZIP */>);
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	722 Register("/tools/create-media",
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	723 CreateBatch<true /* media /, false / not extended by default */>);
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	724 Register("/tools/create-media-extended",
eea66afed0db remove redundancies Sebastien Jodogne <s.jodogne@gmail.com> parents: 2969 diff changeset	725 CreateBatch<true /* media /, true / extended by default */>);
751 5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726 }
5197fd35333c refactoring of OrthancRestApi Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp @ 4797:4e765c18ace7 storage-cache