Mercurial > hg > orthanc

annotate OrthancServer/OrthancRestApi/OrthancRestArchive.cpp @ 2627:00b6a7f935fc jobs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring of archive creation
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 25 May 2018 14:07:52 +0200
parents 878b59270859
children 7ba7d5806911
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
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
2447
878b59270859 upgrade to year 2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2446
diff changeset
5 * Copyright (C) 2017-2018 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
2382
7284093111b0 big reorganization to cleanly separate framework vs. server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2244
diff changeset
37 #include "../../Core/DicomParsing/DicomDirWriter.h"
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
38 #include "../../Core/FileStorage/StorageAccessor.h"
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include "../../Core/Compression/HierarchicalZipWriter.h"
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 #include "../../Core/HttpServer/FilesystemHttpSender.h"
1486
f967bdf8534e refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1437
diff changeset
41 #include "../../Core/Logging.h"
2142
5a8840920121 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2140
diff changeset
42 #include "../../Core/TemporaryFile.h"
1437
02f5a3f5c0a0 access to the REST API from Lua
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1315
diff changeset
43 #include "../ServerContext.h"
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44
884
cd8a69aa4093 creation of branch plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 831
diff changeset
45 #include <stdio.h>
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 #if defined(_MSC_VER)
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 #define snprintf _snprintf
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 #endif
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 static const uint64_t MEGA_BYTES = 1024 * 1024;
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 static const uint64_t GIGA_BYTES = 1024 * 1024 * 1024;
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 namespace Orthanc
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 {
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56 // Download of ZIP files ----------------------------------------------------
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
58 static bool IsZip64Required(uint64_t uncompressedSize,
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
59 unsigned int countInstances)
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
60 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
61 static const uint64_t SAFETY_MARGIN = 64 * MEGA_BYTES; // Should be large enough to hold DICOMDIR
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
62 static const unsigned int FILES_MARGIN = 10;
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
63
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
64 /**
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
65 * Determine whether ZIP64 is required. Original ZIP format can
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
66 * store up to 2GB of data (some implementation supporting up to
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67 * 4GB of data), and up to 65535 files.
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 * https://en.wikipedia.org/wiki/Zip_(file_format)#ZIP64
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 **/
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
70
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
71 const bool isZip64 = (uncompressedSize >= 2 * GIGA_BYTES - SAFETY_MARGIN ||
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
72 countInstances >= 65535 - FILES_MARGIN);
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
73
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 LOG(INFO) << "Creating a ZIP file with " << countInstances << " files of size "
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
75 << (uncompressedSize / MEGA_BYTES) << "MB using the "
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 << (isZip64 ? "ZIP64" : "ZIP32") << " file format";
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 976
diff changeset
78 return isZip64;
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 976
diff changeset
79 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
80
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
81
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
82 namespace
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
83 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
84 class ResourceIdentifiers : public boost::noncopyable
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
85 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
86 private:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
87 ResourceType level_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
88 std::string patient_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
89 std::string study_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
90 std::string series_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
91 std::string instance_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
92
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
93 static void GoToParent(ServerIndex& index,
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
94 std::string& current)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
95 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
96 std::string tmp;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
97
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
98 if (index.LookupParent(tmp, current))
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
99 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
100 current = tmp;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
101 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
102 else
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
103 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
104 throw OrthancException(ErrorCode_UnknownResource);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
105 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
106 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
107
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
108
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
109 public:
1776
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1775
diff changeset
110 ResourceIdentifiers(ServerIndex& index,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1775
diff changeset
111 const std::string& publicId)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
112 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
113 if (!index.LookupResourceType(level_, publicId))
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
114 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
115 throw OrthancException(ErrorCode_UnknownResource);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
116 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
117
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
118 std::string current = publicId;;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
119 switch (level_) // Do not add "break" below!
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
120 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
121 case ResourceType_Instance:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
122 instance_ = current;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
123 GoToParent(index, current);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
124
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
125 case ResourceType_Series:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
126 series_ = current;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
127 GoToParent(index, current);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
128
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
129 case ResourceType_Study:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
130 study_ = current;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
131 GoToParent(index, current);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
132
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
133 case ResourceType_Patient:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
134 patient_ = current;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
135 break;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
136
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
137 default:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
138 throw OrthancException(ErrorCode_InternalError);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
139 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
140 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
141
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
142 ResourceType GetLevel() const
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
143 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
144 return level_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
145 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
146
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
147 const std::string& GetIdentifier(ResourceType level) const
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
148 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
149 // Some sanity check to ensure enumerations are not altered
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
150 assert(ResourceType_Patient < ResourceType_Study);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
151 assert(ResourceType_Study < ResourceType_Series);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
152 assert(ResourceType_Series < ResourceType_Instance);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
153
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
154 if (level > level_)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
155 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
156 throw OrthancException(ErrorCode_InternalError);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
157 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
158
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
159 switch (level)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
160 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
161 case ResourceType_Patient:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
162 return patient_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
163
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
164 case ResourceType_Study:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
165 return study_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
166
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
167 case ResourceType_Series:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
168 return series_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
169
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
170 case ResourceType_Instance:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
171 return instance_;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
172
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
173 default:
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
174 throw OrthancException(ErrorCode_InternalError);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
175 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
176 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
177 };
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
178
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
179
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
180 class IArchiveVisitor : public boost::noncopyable
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
181 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
182 public:
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
183 virtual ~IArchiveVisitor()
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
184 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
185 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
186
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
187 virtual void Open(ResourceType level,
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
188 const std::string& publicId) = 0;
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
189
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
190 virtual void Close() = 0;
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
191
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
192 virtual void AddInstance(const std::string& instanceId,
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
193 const FileInfo& dicom) = 0;
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
194 };
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
195
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
196
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
197 class ArchiveIndex : public boost::noncopyable
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
198 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
199 private:
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
200 struct Instance
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
201 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
202 std::string id_;
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
203 FileInfo dicom_;
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
204
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
205 Instance(const std::string& id,
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
206 const FileInfo& dicom) :
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
207 id_(id), dicom_(dicom)
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
208 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
209 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
210 };
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
211
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
212 // A "NULL" value for ArchiveIndex indicates a non-expanded node
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
213 typedef std::map<std::string, ArchiveIndex*> Resources;
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
214
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
215 ResourceType level_;
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
216 Resources resources_; // Only at patient/study/series level
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
217 std::list<Instance> instances_; // Only at instance level
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
218
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
219
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
220 void AddResourceToExpand(ServerIndex& index,
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
221 const std::string& id)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
222 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
223 if (level_ == ResourceType_Instance)
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
224 {
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
225 FileInfo tmp;
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
226 if (index.LookupAttachment(tmp, id, FileContentType_Dicom))
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
227 {
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
228 instances_.push_back(Instance(id, tmp));
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
229 }
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
230 }
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
231 else
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
232 {
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
233 resources_[id] = NULL;
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
234 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
235 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
236
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
237
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
238 public:
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
239 ArchiveIndex(ResourceType level) :
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
240 level_(level)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
241 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
242 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
243
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
244 ~ArchiveIndex()
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
245 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
246 for (Resources::iterator it = resources_.begin();
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
247 it != resources_.end(); ++it)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
248 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
249 delete it->second;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
250 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
251 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
252
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
253
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
254 void Add(ServerIndex& index,
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
255 const ResourceIdentifiers& resource)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
256 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
257 const std::string& id = resource.GetIdentifier(level_);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
258 Resources::iterator previous = resources_.find(id);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
259
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
260 if (level_ == ResourceType_Instance)
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
261 {
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
262 AddResourceToExpand(index, id);
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
263 }
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
264 else if (resource.GetLevel() == level_)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
265 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
266 // Mark this resource for further expansion
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
267 if (previous != resources_.end())
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
268 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
269 delete previous->second;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
270 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
271
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
272 resources_[id] = NULL;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
273 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
274 else if (previous == resources_.end())
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
275 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
276 // This is the first time we meet this resource
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
277 std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
278 child->Add(index, resource);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
279 resources_[id] = child.release();
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
280 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
281 else if (previous->second != NULL)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
282 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
283 previous->second->Add(index, resource);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
284 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
285 else
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
286 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
287 // Nothing to do: This item is marked for further expansion
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
288 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
289 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
290
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
291
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
292 void Expand(ServerIndex& index)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
293 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
294 if (level_ == ResourceType_Instance)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
295 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
296 // Expanding an instance node makes no sense
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
297 return;
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
298 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
299
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
300 for (Resources::iterator it = resources_.begin();
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
301 it != resources_.end(); ++it)
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
302 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
303 if (it->second == NULL)
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
304 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
305 // This is resource is marked for expansion
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
306 std::list<std::string> children;
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
307 index.GetChildren(children, it->first);
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
308
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
309 std::auto_ptr<ArchiveIndex> child(new ArchiveIndex(GetChildResourceType(level_)));
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
310
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
311 for (std::list<std::string>::const_iterator
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
312 it2 = children.begin(); it2 != children.end(); ++it2)
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
313 {
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
314 child->AddResourceToExpand(index, *it2);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
315 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
316
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
317 it->second = child.release();
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
318 }
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
319
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
320 assert(it->second != NULL);
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
321 it->second->Expand(index);
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
322 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
323 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
324
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
325
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
326 void Apply(IArchiveVisitor& visitor) const
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
327 {
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
328 if (level_ == ResourceType_Instance)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
329 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
330 for (std::list<Instance>::const_iterator
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
331 it = instances_.begin(); it != instances_.end(); ++it)
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
332 {
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
333 visitor.AddInstance(it->id_, it->dicom_);
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
334 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
335 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
336 else
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
337 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
338 for (Resources::const_iterator it = resources_.begin();
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
339 it != resources_.end(); ++it)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
340 {
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
341 assert(it->second != NULL); // There must have been a call to "Expand()"
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
342 visitor.Open(level_, it->first);
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
343 it->second->Apply(visitor);
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
344 visitor.Close();
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
345 }
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
346 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
347 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
348 };
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
349
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
350
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
351
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
352 class ArchiveCommands : public boost::noncopyable
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
353 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
354 private:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
355 enum Type
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
356 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
357 Type_OpenDirectory,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
358 Type_CloseDirectory,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
359 Type_WriteInstance
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
360 };
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
361
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
362 class Command : public boost::noncopyable
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
363 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
364 private:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
365 Type type_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
366 std::string filename_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
367 std::string instanceId_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
368 FileInfo info_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
369
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
370 public:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
371 explicit Command(Type type) :
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
372 type_(type)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
373 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
374 assert(type_ == Type_CloseDirectory);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
375 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
376
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
377 Command(Type type,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
378 const std::string& filename) :
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
379 type_(type),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
380 filename_(filename)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
381 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
382 assert(type_ == Type_OpenDirectory);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
383 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
384
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
385 Command(Type type,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
386 const std::string& filename,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
387 const std::string& instanceId,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
388 const FileInfo& info) :
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
389 type_(type),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
390 filename_(filename),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
391 instanceId_(instanceId),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
392 info_(info)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
393 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
394 assert(type_ == Type_WriteInstance);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
395 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
396
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
397 void Apply(HierarchicalZipWriter& writer,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
398 ServerContext& context,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
399 DicomDirWriter* dicomDir,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
400 const std::string& dicomDirFolder) const
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
401 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
402 switch (type_)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
403 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
404 case Type_OpenDirectory:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
405 writer.OpenDirectory(filename_.c_str());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
406 break;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
407
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
408 case Type_CloseDirectory:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
409 writer.CloseDirectory();
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
410 break;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
411
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
412 case Type_WriteInstance:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
413 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
414 std::string content;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
415
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
416 try
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
417 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
418 context.ReadAttachment(content, info_);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
419 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
420 catch (OrthancException& e)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
421 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
422 LOG(WARNING) << "An instance was removed after the job was issued: " << instanceId_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
423 return;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
424 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
425
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
426 writer.OpenFile(filename_.c_str());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
427 writer.Write(content);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
428
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
429 if (dicomDir != NULL)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
430 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
431 ParsedDicomFile parsed(content);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
432 dicomDir->Add(dicomDirFolder, filename_, parsed);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
433 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
434
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
435 break;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
436 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
437
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
438 default:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
439 throw OrthancException(ErrorCode_InternalError);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
440 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
441 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
442 };
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
443
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
444 std::deque<Command*> commands_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
445 uint64_t uncompressedSize_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
446 unsigned int instancesCount_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
447
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
448
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
449 void ApplyInternal(HierarchicalZipWriter& writer,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
450 ServerContext& context,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
451 size_t index,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
452 DicomDirWriter* dicomDir,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
453 const std::string& dicomDirFolder) const
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
454 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
455 if (index >= commands_.size())
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
456 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
457 throw OrthancException(ErrorCode_ParameterOutOfRange);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
458 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
459
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
460 commands_[index]->Apply(writer, context, dicomDir, dicomDirFolder);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
461 }
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
462
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
463 public:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
464 ArchiveCommands() :
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
465 uncompressedSize_(0),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
466 instancesCount_(0)
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
467 {
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
468 }
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
469
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
470 ~ArchiveCommands()
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
471 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
472 for (std::deque<Command*>::iterator it = commands_.begin();
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
473 it != commands_.end(); ++it)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
474 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
475 assert(*it != NULL);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
476 delete *it;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
477 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
478 }
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
479
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
480 size_t GetSize() const
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
481 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
482 return commands_.size();
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
483 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
484
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
485 unsigned int GetInstancesCount() const
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
486 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
487 return instancesCount_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
488 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
489
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
490 uint64_t GetUncompressedSize() const
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
491 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
492 return uncompressedSize_;
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
493 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
494
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
495 void Apply(HierarchicalZipWriter& writer,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
496 ServerContext& context,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
497 size_t index,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
498 DicomDirWriter& dicomDir,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
499 const std::string& dicomDirFolder) const
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
500 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
501 ApplyInternal(writer, context, index, &dicomDir, dicomDirFolder);
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
502 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
503
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
504 void Apply(HierarchicalZipWriter& writer,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
505 ServerContext& context,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
506 size_t index) const
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
507 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
508 ApplyInternal(writer, context, index, NULL, "");
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
509 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
510
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
511 void AddOpenDirectory(const std::string& filename)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
512 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
513 commands_.push_back(new Command(Type_OpenDirectory, filename));
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
514 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
515
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
516 void AddCloseDirectory()
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
517 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
518 commands_.push_back(new Command(Type_CloseDirectory));
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
519 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
520
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
521 void AddWriteInstance(const std::string& filename,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
522 const std::string& instanceId,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
523 const FileInfo& info)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
524 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
525 commands_.push_back(new Command(Type_WriteInstance, filename, instanceId, info));
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
526 instancesCount_ ++;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
527 uncompressedSize_ += info.GetUncompressedSize();
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
528 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
529
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
530 bool IsZip64() const
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
531 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
532 return IsZip64Required(GetUncompressedSize(), GetInstancesCount());
1775
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
533 }
1861e410a9d7 visitors
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1774
diff changeset
534 };
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
535
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
536
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
537
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
538 class ArchiveWriterVisitor : public IArchiveVisitor
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
539 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
540 private:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
541 ArchiveCommands& commands_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
542 ServerContext& context_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
543 char instanceFormat_[24];
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
544 unsigned int counter_;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
545
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
546 static std::string GetTag(const DicomMap& tags,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
547 const DicomTag& tag)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
548 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
549 const DicomValue* v = tags.TestAndGetValue(tag);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
550 if (v != NULL &&
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
551 !v->IsBinary() &&
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
552 !v->IsNull())
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
553 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
554 return v->GetContent();
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
555 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
556 else
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
557 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
558 return "";
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
559 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
560 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
561
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
562 public:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
563 ArchiveWriterVisitor(ArchiveCommands& commands,
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
564 ServerContext& context) :
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
565 commands_(commands),
1847
559956d5ceb2 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1778
diff changeset
566 context_(context),
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
567 counter_(0)
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
568 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
569 if (commands.GetSize() != 0)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
570 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
571 throw OrthancException(ErrorCode_BadSequenceOfCalls);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
572 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
573
1847
559956d5ceb2 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1778
diff changeset
574 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%%08d.dcm");
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
575 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
576
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
577 virtual void Open(ResourceType level,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
578 const std::string& publicId)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
579 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
580 std::string path;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
581
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
582 DicomMap tags;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
583 if (context_.GetIndex().GetMainDicomTags(tags, publicId, level, level))
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
584 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
585 switch (level)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
586 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
587 case ResourceType_Patient:
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
588 path = GetTag(tags, DICOM_TAG_PATIENT_ID) + " " + GetTag(tags, DICOM_TAG_PATIENT_NAME);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
589 break;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
590
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
591 case ResourceType_Study:
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
592 path = GetTag(tags, DICOM_TAG_ACCESSION_NUMBER) + " " + GetTag(tags, DICOM_TAG_STUDY_DESCRIPTION);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
593 break;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
594
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
595 case ResourceType_Series:
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
596 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
597 std::string modality = GetTag(tags, DICOM_TAG_MODALITY);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
598 path = modality + " " + GetTag(tags, DICOM_TAG_SERIES_DESCRIPTION);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
599
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
600 if (modality.size() == 0)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
601 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
602 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%%08d.dcm");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
603 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
604 else if (modality.size() == 1)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
605 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
606 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%c%%07d.dcm",
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
607 toupper(modality[0]));
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
608 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
609 else if (modality.size() >= 2)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
610 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
611 snprintf(instanceFormat_, sizeof(instanceFormat_) - 1, "%c%c%%06d.dcm",
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
612 toupper(modality[0]), toupper(modality[1]));
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
613 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
614
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
615 counter_ = 0;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
616
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
617 break;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
618 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
619
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
620 default:
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
621 throw OrthancException(ErrorCode_InternalError);
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 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
624
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
625 path = Toolbox::StripSpaces(Toolbox::ConvertToAscii(path));
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
626
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
627 if (path.empty())
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
628 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
629 path = std::string("Unknown ") + EnumerationToString(level);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
630 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
631
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
632 commands_.AddOpenDirectory(path.c_str());
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
633 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
634
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
635 virtual void Close()
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
636 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
637 commands_.AddCloseDirectory();
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
638 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
639
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
640 virtual void AddInstance(const std::string& instanceId,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
641 const FileInfo& dicom)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
642 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
643 char filename[24];
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
644 snprintf(filename, sizeof(filename) - 1, instanceFormat_, counter_);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
645 counter_ ++;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
646
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
647 commands_.AddWriteInstance(filename, instanceId, dicom);
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
648 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
649
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
650 static void Apply(RestApiOutput& output,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
651 ServerContext& context,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
652 ArchiveIndex& archive,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
653 const std::string& filename)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
654 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
655 ArchiveCommands commands;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
656
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
657 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
658 ArchiveWriterVisitor visitor(commands, context);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
659 archive.Expand(context.GetIndex());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
660 archive.Apply(visitor);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
661 }
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
662
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
663 // Create a RAII for the temporary file to manage the ZIP file
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2128
diff changeset
664 TemporaryFile tmp;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
665
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
666 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
667 HierarchicalZipWriter writer(tmp.GetPath().c_str());
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
668 writer.SetZip64(commands.IsZip64());
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
669
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
670 for (size_t i = 0; i < commands.GetSize(); i++)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
671 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
672 commands.Apply(writer, context, i);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
673 }
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
674 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
675
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
676 // Prepare the sending of the ZIP file
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
677 FilesystemHttpSender sender(tmp.GetPath());
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
678 sender.SetContentType("application/zip");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
679 sender.SetContentFilename(filename);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
680
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
681 // Send the ZIP
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
682 output.AnswerStream(sender);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
683
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
684 // The temporary file is automatically removed thanks to the RAII
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
685 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
686 };
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
687
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
688
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
689 class MediaWriterVisitor : public IArchiveVisitor
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
690 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
691 private:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
692 ArchiveCommands& commands_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
693 ServerContext& context_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
694 unsigned int counter_;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
695
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
696 public:
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
697 MediaWriterVisitor(ArchiveCommands& commands,
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
698 ServerContext& context) :
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
699 commands_(commands),
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
700 context_(context),
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
701 counter_(0)
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
702 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
703 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
704
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
705 virtual void Open(ResourceType level,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
706 const std::string& publicId)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
707 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
708 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
709
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
710 virtual void Close()
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
711 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
712 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
713
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
714 virtual void AddInstance(const std::string& instanceId,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
715 const FileInfo& dicom)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
716 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
717 // "DICOM restricts the filenames on DICOM media to 8
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
718 // characters (some systems wrongly use 8.3, but this does not
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
719 // conform to the standard)."
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
720 std::string filename = "IM" + boost::lexical_cast<std::string>(counter_);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
721 commands_.AddWriteInstance(filename, instanceId, dicom);
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
722
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
723 counter_ ++;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
724 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
725
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
726 static void Apply(RestApiOutput& output,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
727 ServerContext& context,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
728 ArchiveIndex& archive,
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
729 const std::string& filename,
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
730 bool enableExtendedSopClass)
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
731 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
732 static const char* IMAGES_FOLDER = "IMAGES";
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
733
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
734 ArchiveCommands commands;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
735
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
736 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
737 MediaWriterVisitor visitor(commands, context);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
738 archive.Expand(context.GetIndex());
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
739
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
740 commands.AddOpenDirectory(IMAGES_FOLDER);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
741 archive.Apply(visitor);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
742 commands.AddCloseDirectory();
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
743 }
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
744
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
745 // Create a RAII for the temporary file to manage the ZIP file
2140
aa4b8895cd23 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2128
diff changeset
746 TemporaryFile tmp;
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
747
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
748 {
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
749 DicomDirWriter dicomDir;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
750 dicomDir.EnableExtendedSopClass(enableExtendedSopClass);
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
751
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
752 HierarchicalZipWriter writer(tmp.GetPath().c_str());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
753 writer.SetZip64(commands.IsZip64());
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
754
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
755 for (size_t i = 0; i < commands.GetSize(); i++)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
756 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
757 commands.Apply(writer, context, i, dicomDir, IMAGES_FOLDER);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
758 }
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
759
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
760 // Add the DICOMDIR
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
761 writer.OpenFile("DICOMDIR");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
762 std::string s;
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
763 dicomDir.Encode(s);
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
764 writer.Write(s);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
765 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
766
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
767
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
768 // Prepare the sending of the ZIP file
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
769 FilesystemHttpSender sender(tmp.GetPath());
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
770 sender.SetContentType("application/zip");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
771 sender.SetContentFilename(filename);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
772
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
773 // Send the ZIP
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
774 output.AnswerStream(sender);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
775
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
776 // The temporary file is automatically removed thanks to the RAII
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
777 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
778 };
2627
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
779
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
780
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
781 #if 0
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
782 class ArchiveJob : public IJob
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
783 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
784 private:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
785 ServerContext& context_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
786 ArchiveIndex archive_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
787 bool isMedia_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
788 std::auto_ptr<TemporaryFile> file_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
789 std::auto_ptr<HierarchicalZipWriter> writer_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
790 std::auto_ptr<IArchiveVisitor> visitor_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
791 std::string description_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
792 bool started_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
793 unsigned int currentInstance_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
794
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
795 public:
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
796 ArchiveJob(ServerContext& context,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
797 ResourceType level,
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
798 bool isMedia) :
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
799 context_(context),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
800 archive_(level),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
801 isMedia_(isMedia),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
802 started_(false),
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
803 currentInstance_(0)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
804 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
805 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
806
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
807 void SetDescription(const std::string& description)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
808 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
809 description_ = description;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
810 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
811
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
812 const std::string& GetDescription() const
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
813 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
814 return description_;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
815 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
816
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
817 void AddResource(const std::string& publicId)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
818 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
819 if (started_)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
820 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
821 throw OrthancException(ErrorCode_BadSequenceOfCalls);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
822 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
823
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
824 ResourceIdentifiers resource(context_.GetIndex(), publicId);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
825 archive_.Add(context_.GetIndex(), resource);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
826 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
827
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
828 virtual void SignalResubmit()
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
829 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
830 LOG(ERROR) << "Cannot resubmit the creation of an archive";
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
831 throw OrthancException(ErrorCode_BadSequenceOfCalls);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
832 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
833
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
834 virtual void Start()
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
835 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
836 if (started_)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
837 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
838 throw OrthancException(ErrorCode_BadSequenceOfCalls);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
839 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
840
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
841 started_ = true;
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
842
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
843 archive_.Expand(context_.GetIndex());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
844
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
845 const bool isZip64 = IsZip64Required(stats_.GetUncompressedSize(), stats_.GetInstancesCount());
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
846
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
847 file_.reset(new TemporaryFile);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
848 writer_.reset(new HierarchicalZipWriter(file_->GetPath().c_str()));
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
849 writer_->SetZip64(isZip64);
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
850
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
851 if (isMedia_)
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
852 {
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
853 //visitor_.reset(new
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
854 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
855 }
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
856 };
00b6a7f935fc refactoring of archive creation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2447
diff changeset
857 #endif
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
858 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
859
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
860
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
861 static bool AddResourcesOfInterest(ArchiveIndex& archive,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
862 RestApiPostCall& call)
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
863 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
864 ServerIndex& index = OrthancRestApi::GetIndex(call);
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
865
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
866 Json::Value resources;
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
867 if (call.ParseJsonRequest(resources) &&
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
868 resources.type() == Json::arrayValue)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
869 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
870 for (Json::Value::ArrayIndex i = 0; i < resources.size(); i++)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
871 {
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
872 if (resources[i].type() != Json::stringValue)
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
873 {
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
874 return false; // Bad request
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
875 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
876
1776
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1775
diff changeset
877 ResourceIdentifiers resource(index, resources[i].asString());
1777
0f5c416969dc more memory-efficient ArchiveIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1776
diff changeset
878 archive.Add(index, resource);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
879 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
880
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
881 return true;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
882 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
883 else
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
884 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
885 return false;
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
886 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
887 }
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
888
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
889
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
890 static void CreateBatchArchive(RestApiPostCall& call)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
891 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
892 ArchiveIndex archive(ResourceType_Patient); // root
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
893
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
894 if (AddResourcesOfInterest(archive, call))
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
895 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
896 ArchiveWriterVisitor::Apply(call.GetOutput(),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
897 OrthancRestApi::GetContext(call),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
898 archive,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
899 "Archive.zip");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
900 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
901 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
902
2446
a894adc8bb03 /tools/create-media-extended to include type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2422
diff changeset
903
a894adc8bb03 /tools/create-media-extended to include type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2422
diff changeset
904 template <bool Extended>
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
905 static void CreateBatchMedia(RestApiPostCall& call)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
906 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
907 ArchiveIndex archive(ResourceType_Patient); // root
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
908
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
909 if (AddResourcesOfInterest(archive, call))
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
910 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
911 MediaWriterVisitor::Apply(call.GetOutput(),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
912 OrthancRestApi::GetContext(call),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
913 archive,
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
914 "Archive.zip",
2446
a894adc8bb03 /tools/create-media-extended to include type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2422
diff changeset
915 Extended);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
916 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
917 }
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
918
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
919
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
920 static void CreateArchive(RestApiGetCall& call)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
921 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
922 ServerIndex& index = OrthancRestApi::GetIndex(call);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
923
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
924 std::string id = call.GetUriComponent("id", "");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
925 ResourceIdentifiers resource(index, id);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
926
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
927 ArchiveIndex archive(ResourceType_Patient); // root
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
928 archive.Add(OrthancRestApi::GetIndex(call), resource);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
929
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
930 ArchiveWriterVisitor::Apply(call.GetOutput(),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
931 OrthancRestApi::GetContext(call),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
932 archive,
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
933 id + ".zip");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
934 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
935
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
936
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
937 static void CreateMedia(RestApiGetCall& call)
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
938 {
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
939 ServerIndex& index = OrthancRestApi::GetIndex(call);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
940
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
941 std::string id = call.GetUriComponent("id", "");
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
942 ResourceIdentifiers resource(index, id);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
943
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
944 ArchiveIndex archive(ResourceType_Patient); // root
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
945 archive.Add(OrthancRestApi::GetIndex(call), resource);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
946
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
947 MediaWriterVisitor::Apply(call.GetOutput(),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
948 OrthancRestApi::GetContext(call),
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
949 archive,
2422
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
950 id + ".zip",
b340f0a9022c New argument "/.../media?extended" to include additional type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2382
diff changeset
951 call.HasArgument("extended"));
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
952 }
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
953
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
954
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
955 void OrthancRestApi::RegisterArchive()
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
956 {
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
957 Register("/patients/{id}/archive", CreateArchive);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
958 Register("/studies/{id}/archive", CreateArchive);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
959 Register("/series/{id}/archive", CreateArchive);
1121
82567bac5e25 Creation of ZIP archives for media storage, with DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 976
diff changeset
960
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
961 Register("/patients/{id}/media", CreateMedia);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
962 Register("/studies/{id}/media", CreateMedia);
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
963 Register("/series/{id}/media", CreateMedia);
1774
784a6b92d2f1 start of refactoring the creation of archives
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1623
diff changeset
964
1778
776573e592da create media refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1777
diff changeset
965 Register("/tools/create-archive", CreateBatchArchive);
2446
a894adc8bb03 /tools/create-media-extended to include type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2422
diff changeset
966 Register("/tools/create-media", CreateBatchMedia<false>);
a894adc8bb03 /tools/create-media-extended to include type-3 tags in DICOMDIR
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2422
diff changeset
967 Register("/tools/create-media-extended", CreateBatchMedia<true>);
751
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
968 }
5197fd35333c refactoring of OrthancRestApi
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
969 }