Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerIndex.cpp @ 4576:f6cd49af7526 db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 08 Mar 2021 18:42:13 +0100
parents e23bacd4fffc
children a114a5db2afe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
1900
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1898
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288
6e7e5ed91c2d upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1286
diff changeset
4 * Department, University Hospital of Liege, Belgium
4437
d9473bd5ed43 upgrade to year 2021
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4371
diff changeset
5 * Copyright (C) 2017-2021 Osimis S.A., Belgium
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * This program is free software: you can redistribute it and/or
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * modify it under the terms of the GNU General Public License as
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * published by the Free Software Foundation, either version 3 of the
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * License, or (at your option) any later version.
136
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
11 *
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
12 * In addition, as a special exception, the copyright holders of this
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
13 * program give permission to link the code of its release with the
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
15 * that use the same license as the "OpenSSL" library), and distribute
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
16 * the linked executables. You must obey the GNU General Public License
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
17 * in all respects for all of the code used other than "OpenSSL". If you
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
18 * modify file(s) with this exception, you may extend this exception to
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
19 * your version of the file(s), but you are not obligated to do so. If
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
20 * you do not wish to do so, delete this exception statement from your
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
21 * version. If you delete this exception statement from all source files
fe180eae201d openssl exception
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 108
diff changeset
22 * in the program, then also delete it here.
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * This program is distributed in the hope that it will be useful, but
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * WITHOUT ANY WARRANTY; without even the implied warranty of
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 * General Public License for more details.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 *
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * You should have received a copy of the GNU General Public License
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31 **/
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
3959d33612cc initial commit
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"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35 #include "ServerIndex.h"
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
6
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
37 #ifndef NOMINMAX
2
67a6978503b7 fixing Windows build
Jodogne@Laptop
parents: 0
diff changeset
38 #define NOMINMAX
6
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
39 #endif
9d483cf71d17 fix warnings
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2
diff changeset
40
4045
05b8fd21089c fix path
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
41 #include "../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
05b8fd21089c fix path
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
42 #include "../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
05b8fd21089c fix path
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
43 #include "../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
05b8fd21089c fix path
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
44 #include "../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4044
diff changeset
45 #include "../../OrthancFramework/Sources/Toolbox.h"
3094
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
46
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
47 #include "Database/ResourcesContent.h"
2940
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
48 #include "OrthancConfiguration.h"
3094
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
49 #include "Search/DatabaseLookup.h"
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
50 #include "Search/DicomTagConstraint.h"
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
51 #include "ServerContext.h"
61da3c9b4121 cont reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3093
diff changeset
52 #include "ServerIndexChange.h"
1668
de1413733c97 reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
53 #include "ServerToolbox.h"
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 #include <boost/lexical_cast.hpp>
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
56 #include <boost/tuple/tuple.hpp>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57 #include <stdio.h>
4488
50b3f4c8107e fix missing include for Debian unstable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4460
diff changeset
58 #include <stack>
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59
440
23e5b35e3c5c statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
60 static const uint64_t MEGA_BYTES = 1024 * 1024;
23e5b35e3c5c statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
61
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
62 namespace Orthanc
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
63 {
3075
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
64 static void CopyListToVector(std::vector<std::string>& target,
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
65 const std::list<std::string>& source)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
66 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
67 target.resize(source.size());
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
68
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
69 size_t pos = 0;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
70
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
71 for (std::list<std::string>::const_iterator
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
72 it = source.begin(); it != source.end(); ++it)
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
73 {
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
74 target[pos] = *it;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
75 pos ++;
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
76 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
77 }
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
78
ead8576a02ef IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3073
diff changeset
79
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
80 class ServerIndex::Listener : public IDatabaseListener
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
82 private:
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
83 struct FileToRemove
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
84 {
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
85 private:
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
86 std::string uuid_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
87 FileContentType type_;
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
88
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
89 public:
4205
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
90 explicit FileToRemove(const FileInfo& info) :
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
91 uuid_(info.GetUuid()),
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
92 type_(info.GetContentType())
1191
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
93 {
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
94 }
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
95
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
96 const std::string& GetUuid() const
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
97 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
98 return uuid_;
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
99 }
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
100
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
101 FileContentType GetContentType() const
264
5b8e8b74bc8b remove files only after the sqlite transaction has succeeded
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 240
diff changeset
102 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
103 return type_;
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
104 }
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
105 };
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
106
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
107 ServerContext& context_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
108 bool hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
109 ResourceType remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
110 std::string remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
111 std::list<FileToRemove> pendingFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
112 std::list<ServerIndexChange> pendingChanges_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
113 uint64_t sizeOfFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
114 bool insideTransaction_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
115
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
116 void Reset()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
117 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
118 sizeOfFilesToRemove_ = 0;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
119 hasRemainingLevel_ = false;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
120 pendingFilesToRemove_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
121 pendingChanges_.clear();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
122 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
123
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
124 public:
4205
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
125 explicit Listener(ServerContext& context) :
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
126 context_(context),
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
127 insideTransaction_(false)
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
128 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
129 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
130 assert(ResourceType_Patient < ResourceType_Study &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
131 ResourceType_Study < ResourceType_Series &&
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
132 ResourceType_Series < ResourceType_Instance);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
133 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
134
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
135 void StartTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
136 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
137 Reset();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
138 insideTransaction_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
139 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
140
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
141 void EndTransaction()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
142 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
143 insideTransaction_ = false;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
144 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
145
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
146 uint64_t GetSizeOfFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
147 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
148 return sizeOfFilesToRemove_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
149 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
150
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
151 void CommitFilesToRemove()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
152 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
153 for (std::list<FileToRemove>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
154 it = pendingFilesToRemove_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
155 it != pendingFilesToRemove_.end(); ++it)
1189
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
156 {
3702
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
157 try
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
158 {
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
159 context_.RemoveFile(it->GetUuid(), it->GetContentType());
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
160 }
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
161 catch (OrthancException& e)
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
162 {
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
163 LOG(ERROR) << "Unable to remove an attachment from the storage area: "
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
164 << it->GetUuid() << " (type: " << EnumerationToString(it->GetContentType()) << ")";
643b5ee86f92 fix handling of errors of OrthancPluginStorageRemove()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3699
diff changeset
165 }
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
166 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
167 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
168
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
169 void CommitChanges()
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
170 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
171 for (std::list<ServerIndexChange>::const_iterator
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
172 it = pendingChanges_.begin();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
173 it != pendingChanges_.end(); ++it)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
174 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
175 context_.SignalChange(*it);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
176 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
177 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
178
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
179 virtual void SignalRemainingAncestor(ResourceType parentType,
4571
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
180 const std::string& publicId) ORTHANC_OVERRIDE
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
181 {
4268
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4263
diff changeset
182 LOG(TRACE) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
183
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
184 if (hasRemainingLevel_)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
185 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
186 if (parentType < remainingType_)
1189
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
187 {
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
188 remainingType_ = parentType;
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
189 remainingPublicId_ = publicId;
1191
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
190 }
1158
badc14fee61f speed up db
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1148
diff changeset
191 }
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
192 else
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
193 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
194 hasRemainingLevel_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
195 remainingType_ = parentType;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
196 remainingPublicId_ = publicId;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
197 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
198 }
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
199
4571
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
200 virtual void SignalAttachmentDeleted(const FileInfo& info) ORTHANC_OVERRIDE
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
201 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
202 assert(Toolbox::IsUuid(info.GetUuid()));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
203 pendingFilesToRemove_.push_back(FileToRemove(info));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
204 sizeOfFilesToRemove_ += info.GetCompressedSize();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
205 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
206
4571
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
207 virtual void SignalResourceDeleted(ResourceType type,
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
208 const std::string& publicId) ORTHANC_OVERRIDE
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
209 {
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
210 SignalChange(ServerIndexChange(ChangeType_Deleted, type, publicId));
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
211 }
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
212
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4570
diff changeset
213 void SignalChange(const ServerIndexChange& change)
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
214 {
4268
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4263
diff changeset
215 LOG(TRACE) << "Change related to resource " << change.GetPublicId() << " of type "
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4263
diff changeset
216 << EnumerationToString(change.GetResourceType()) << ": "
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4263
diff changeset
217 << EnumerationToString(change.GetChangeType());
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
218
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
219 if (insideTransaction_)
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
220 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
221 pendingChanges_.push_back(change);
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
222 }
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
223 else
201
bee20e978835 refactoring of delete
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 200
diff changeset
224 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
225 context_.SignalChange(change);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
226 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
227 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
228
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
229 bool HasRemainingLevel() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
230 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
231 return hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
232 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
233
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
234 ResourceType GetRemainingType() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
235 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
236 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
237 return remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
238 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
239
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
240 const std::string& GetRemainingPublicId() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
241 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
242 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
243 return remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
244 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
245 };
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
246
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
247
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
248 class ServerIndex::Transaction
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
249 {
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
250 private:
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
251 ServerIndex& index_;
3712
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3702
diff changeset
252 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
253 bool isCommitted_;
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
254 uint64_t sizeOfAddedAttachments_;
4205
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
255
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
256 public:
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
257 explicit Transaction(ServerIndex& index,
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
258 TransactionType type) :
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
259 index_(index),
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
260 isCommitted_(false),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
261 sizeOfAddedAttachments_(0)
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
262 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
263 transaction_.reset(index_.db_.StartTransaction(type));
1191
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
264 index_.listener_->StartTransaction();
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
265 }
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
266
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
267 ~Transaction()
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
268 {
d49505e377e3 demo of OnChangeCallback in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1189
diff changeset
269 index_.listener_->EndTransaction();
1310
61ce8147f30d custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1306
diff changeset
270
61ce8147f30d custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1306
diff changeset
271 if (!isCommitted_)
61ce8147f30d custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1306
diff changeset
272 {
61ce8147f30d custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1306
diff changeset
273 transaction_->Rollback();
61ce8147f30d custom database back-end
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1306
diff changeset
274 }
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
275 }
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
276
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
277 void SignalAttachmentsAdded(uint64_t compressedSize)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
278 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
279 sizeOfAddedAttachments_ += compressedSize;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
280 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
281
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
282 void Commit()
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
283 {
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
284 if (!isCommitted_)
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
285 {
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
286 int64_t delta = (static_cast<int64_t>(sizeOfAddedAttachments_) -
3019
8336204d95dc refactoring computation of disk size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3006
diff changeset
287 static_cast<int64_t>(index_.listener_->GetSizeOfFilesToRemove()));
8336204d95dc refactoring computation of disk size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3006
diff changeset
288
8336204d95dc refactoring computation of disk size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3006
diff changeset
289 transaction_->Commit(delta);
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
290
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
291 // We can remove the files once the SQLite transaction has
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
292 // been successfully committed. Some files might have to be
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
293 // deleted because of recycling.
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
294 index_.listener_->CommitFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
295
1189
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
296 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
297 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
298
278
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
299 isCommitted_ = true;
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
300 }
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
301 }
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
302 };
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
303
771f12042be9 more efficient determination of storage size for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 273
diff changeset
304
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
305 class ServerIndex::UnstableResourcePayload
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
306 {
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
307 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
308 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
309 std::string publicId_;
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
310 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
311
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
312 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
313 UnstableResourcePayload() : type_(ResourceType_Instance)
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
314 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
315 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
316
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
317 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
318 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
319 type_(type),
4205
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
320 publicId_(publicId),
d962a2996637 cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4140
diff changeset
321 time_(boost::posix_time::second_clock::local_time())
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
322 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
323 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
324
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
325 unsigned int GetAge() const
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
326 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
327 return (boost::posix_time::second_clock::local_time() - time_).total_seconds();
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
328 }
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
329
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
330 ResourceType GetResourceType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
331 {
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
332 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
333 }
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
334
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
335 const std::string& GetPublicId() const
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
336 {
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
337 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
338 }
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
339 };
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
340
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
341
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
342 class ServerIndex::MainDicomTagsRegistry : public boost::noncopyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
343 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
344 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
345 class TagInfo
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
346 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
347 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
348 ResourceType level_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
349 DicomTagType type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
351 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
352 TagInfo()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
353 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
354 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
355
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
356 TagInfo(ResourceType level,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
357 DicomTagType type) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
358 level_(level),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
359 type_(type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
360 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
361 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
362
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
363 ResourceType GetLevel() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
364 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
365 return level_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
366 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
367
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
368 DicomTagType GetType() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
369 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
370 return type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
371 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
372 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
373
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
374 typedef std::map<DicomTag, TagInfo> Registry;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
375
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
376
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
377 Registry registry_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
378
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
379 void LoadTags(ResourceType level)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
380 {
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
381 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
382 const DicomTag* tags = NULL;
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
383 size_t size;
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
384
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
385 ServerToolbox::LoadIdentifiers(tags, size, level);
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
386
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
387 for (size_t i = 0; i < size; i++)
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
388 {
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
389 if (registry_.find(tags[i]) == registry_.end())
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
390 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
391 registry_[tags[i]] = TagInfo(level, DicomTagType_Identifier);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
392 }
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
393 else
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
394 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
395 // These patient-level tags are copied in the study level
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
396 assert(level == ResourceType_Study &&
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
397 (tags[i] == DICOM_TAG_PATIENT_ID ||
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
398 tags[i] == DICOM_TAG_PATIENT_NAME ||
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
399 tags[i] == DICOM_TAG_PATIENT_BIRTH_DATE));
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
400 }
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
401 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
402 }
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
403
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
404 {
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
405 std::set<DicomTag> tags;
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
406 DicomMap::GetMainDicomTags(tags, level);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
407
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
408 for (std::set<DicomTag>::const_iterator
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
409 tag = tags.begin(); tag != tags.end(); ++tag)
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
410 {
3650
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
411 if (registry_.find(*tag) == registry_.end())
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
412 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
413 registry_[*tag] = TagInfo(level, DicomTagType_Main);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3640
diff changeset
414 }
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
415 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
416 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
417 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
418
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
419 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
420 MainDicomTagsRegistry()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
421 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
422 LoadTags(ResourceType_Patient);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
423 LoadTags(ResourceType_Study);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
424 LoadTags(ResourceType_Series);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
425 LoadTags(ResourceType_Instance);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
426 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
427
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
428 void LookupTag(ResourceType& level,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
429 DicomTagType& type,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
430 const DicomTag& tag) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
431 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
432 Registry::const_iterator it = registry_.find(tag);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
433
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
434 if (it == registry_.end())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
435 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
436 // Default values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
437 level = ResourceType_Instance;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
438 type = DicomTagType_Generic;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
439 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
440 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
441 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
442 level = it->second.GetLevel();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
443 type = it->second.GetType();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
444 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
445 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
446 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
447
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
448
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
449 void ServerIndex::FlushThread(ServerIndex* that,
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
450 unsigned int threadSleep)
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
451 {
1102
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
452 // By default, wait for 10 seconds before flushing
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
453 unsigned int sleep = 10;
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
454
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
455 try
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
456 {
744
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 739
diff changeset
457 boost::mutex::scoped_lock lock(that->mutex_);
1239
92c6b3b57699 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1238
diff changeset
458 std::string sleepString;
1102
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
459
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
460 if (that->db_.LookupGlobalProperty(sleepString, GlobalProperty_FlushSleep) &&
1239
92c6b3b57699 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1238
diff changeset
461 Toolbox::IsInteger(sleepString))
1102
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
462 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
463 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1006
diff changeset
464 }
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
465 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
466 catch (boost::bad_lexical_cast&)
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
467 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
468 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
469
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
470 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
471
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
472 unsigned int count = 0;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
473
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
474 while (!that->done_)
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
475 {
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
476 boost::this_thread::sleep(boost::posix_time::milliseconds(threadSleep));
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
477 count++;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
478 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
479 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
480 continue;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
481 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
482
2217
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2209
diff changeset
483 Logging::Flush();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2209
diff changeset
484
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
485 boost::mutex::scoped_lock lock(that->mutex_);
3698
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
486
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
487 try
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
488 {
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
489 that->db_.FlushToDisk();
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
490 }
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
491 catch (OrthancException&)
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
492 {
3699
efa815dd2c20 additional logging
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3698
diff changeset
493 LOG(ERROR) << "Cannot flush the SQLite database to the disk (is your filesystem full?)";
3698
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
494 }
356ebef2cd95 prevent crash on full disk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3650
diff changeset
495
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
496 count = 0;
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
497 }
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
498
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
499 LOG(INFO) << "Stopping the database flushing thread";
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
500 }
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
501
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
502
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
503 static bool ComputeExpectedNumberOfInstances(int64_t& target,
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
504 const DicomMap& dicomSummary)
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
505 {
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
506 try
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
507 {
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
508 const DicomValue* value;
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
509 const DicomValue* value2;
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
510
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
511 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
512 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
513 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
514 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
515 !value2->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
516 !value2->IsBinary())
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
517 {
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
518 // Patch for series with temporal positions thanks to Will Ryder
1737
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
519 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->GetContent());
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
520 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->GetContent());
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
521 target = imagesInAcquisition * countTemporalPositions;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
522 return (target > 0);
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
523 }
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
524
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
525 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
526 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
527 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
528 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
529 !value2->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
530 !value2->IsNull())
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
531 {
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
532 // Support of Cardio-PET images
1737
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
533 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->GetContent());
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
534 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->GetContent());
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
535 target = numberOfSlices * numberOfTimeSlices;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
536 return (target > 0);
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
537 }
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
538
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
539 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
540 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
541 !value->IsBinary())
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
542 {
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
543 target = boost::lexical_cast<int64_t>(value->GetContent());
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
544 return (target > 0);
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
545 }
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
546 }
1737
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
547 catch (OrthancException&)
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
548 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
549 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1725
diff changeset
550 catch (boost::bad_lexical_cast&)
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
551 {
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
552 }
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
553
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
554 return false;
433
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
555 }
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
556
aa50783f9550 cardiopet
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 432
diff changeset
557
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
558
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
559
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
560 static bool LookupStringMetadata(std::string& result,
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
561 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
562 MetadataType type)
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
563 {
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
564 std::map<MetadataType, std::string>::const_iterator found = metadata.find(type);
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
565
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
566 if (found == metadata.end())
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
567 {
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
568 return false;
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
569 }
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
570 else
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
571 {
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
572 result = found->second;
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
573 return true;
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
574 }
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
575 }
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
576
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
577
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
578 static bool LookupIntegerMetadata(int64_t& result,
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
579 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
580 MetadataType type)
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
581 {
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
582 std::string s;
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
583 if (!LookupStringMetadata(s, metadata, type))
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
584 {
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
585 return false;
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
586 }
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
587
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
588 try
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
589 {
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
590 result = boost::lexical_cast<int64_t>(s);
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
591 return true;
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
592 }
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
593 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
594 {
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
595 return false;
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
596 }
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
597 }
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
598
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
599
1297
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
600 void ServerIndex::LogChange(int64_t internalId,
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
601 ChangeType changeType,
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
602 ResourceType resourceType,
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
603 const std::string& publicId)
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
604 {
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
605 ServerIndexChange change(changeType, resourceType, publicId);
1300
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
606
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
607 if (changeType <= ChangeType_INTERNAL_LastLogged)
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
608 {
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
609 db_.LogChange(internalId, change);
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
610 }
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
611
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
612 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1299
diff changeset
613 listener_->SignalChange(change);
1297
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
614 }
501432928727 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1294
diff changeset
615
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
616
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
617 bool ServerIndex::IsUnstableResource(int64_t id)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
618 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
619 return unstableResources_.Contains(id);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
620 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
621
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
622
226
8a26a8e85edf refactoring to read files
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 224
diff changeset
623 ServerIndex::ServerIndex(ServerContext& context,
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
624 IDatabaseWrapper& db,
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
625 unsigned int threadSleep) :
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
626 done_(false),
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
627 db_(db),
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
628 maximumStorageSize_(0),
2826
c277e0421200 unit testing of overwriting
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2825
diff changeset
629 maximumPatients_(0),
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
630 mainDicomTagsRegistry_(new MainDicomTagsRegistry),
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
631 maxRetries_(10)
186
f68c039b0571 preparing refactoring of ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 180
diff changeset
632 {
1432
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1368
diff changeset
633 listener_.reset(new Listener(context));
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
634 db_.SetListener(*listener_);
180
626777d01dc4 use of hashes to index dicom objects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 179
diff changeset
635
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
636 // Initial recycling if the parameters have changed since the last
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
637 // execution of Orthanc
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
638 StandaloneRecycling();
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
639
1306
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1305
diff changeset
640 if (db.HasFlushToDisk())
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1305
diff changeset
641 {
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
642 flushThread_ = boost::thread(FlushThread, this, threadSleep);
1306
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1305
diff changeset
643 }
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1305
diff changeset
644
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
645 unstableResourcesMonitorThread_ = boost::thread
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
646 (UnstableResourcesMonitorThread, this, threadSleep);
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
647 }
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
648
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
649
1453
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
650
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
651 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
652 {
1453
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
653 if (!done_)
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
654 {
1453
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
655 LOG(ERROR) << "INTERNAL ERROR: ServerIndex::Stop() should be invoked manually to avoid mess in the destruction order!";
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
656 Stop();
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
657 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
658 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
659
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
660
1453
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
661
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
662 void ServerIndex::Stop()
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
663 {
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
664 if (!done_)
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
665 {
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
666 done_ = true;
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
667
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
668 if (db_.HasFlushToDisk() &&
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
669 flushThread_.joinable())
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
670 {
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
671 flushThread_.join();
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
672 }
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
673
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
674 if (unstableResourcesMonitorThread_.joinable())
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
675 {
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
676 unstableResourcesMonitorThread_.join();
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
677 }
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
678 }
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
679 }
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
680
c0bdc47165ef code to warn about possible threading problems
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1432
diff changeset
681
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
682 static void SetInstanceMetadata(ResourcesContent& content,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
683 std::map<MetadataType, std::string>& instanceMetadata,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
684 int64_t instance,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
685 MetadataType metadata,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
686 const std::string& value)
2188
7cfc2e0383b3 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
687 {
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
688 content.AddMetadata(instance, metadata, value);
2188
7cfc2e0383b3 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
689 instanceMetadata[metadata] = value;
7cfc2e0383b3 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
690 }
7cfc2e0383b3 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
691
7cfc2e0383b3 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2142
diff changeset
692
1006
649d47854314 proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1004
diff changeset
693 StoreStatus ServerIndex::Store(std::map<MetadataType, std::string>& instanceMetadata,
4505
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4499
diff changeset
694 const DicomMap& dicomSummary,
3813
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3712
diff changeset
695 const Attachments& attachments,
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
696 const MetadataMap& metadata,
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
697 const DicomInstanceOrigin& origin,
4499
6f99949b2878 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4494
diff changeset
698 bool overwrite,
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
699 bool hasTransferSyntax,
4507
b4c58795f3a8 widening the use of DicomTransferSyntax enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4506
diff changeset
700 DicomTransferSyntax transferSyntax,
4499
6f99949b2878 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4494
diff changeset
701 bool hasPixelDataOffset,
6f99949b2878 reorganization
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4494
diff changeset
702 uint64_t pixelDataOffset)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
703 {
206
4453a010d0db flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 205
diff changeset
704 boost::mutex::scoped_lock lock(mutex_);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
705
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
706 int64_t expectedInstances;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
707 const bool hasExpectedInstances =
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
708 ComputeExpectedNumberOfInstances(expectedInstances, dicomSummary);
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
709
1006
649d47854314 proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1004
diff changeset
710 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1004
diff changeset
711
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
712 DicomInstanceHasher hasher(dicomSummary);
4505
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4499
diff changeset
713 const std::string hashPatient = hasher.HashPatient();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4499
diff changeset
714 const std::string hashStudy = hasher.HashStudy();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4499
diff changeset
715 const std::string hashSeries = hasher.HashSeries();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4499
diff changeset
716 const std::string hashInstance = hasher.HashInstance();
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
717
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
718 try
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
719 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
720 Transaction t(*this, TransactionType_ReadWrite);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
721
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
722 IDatabaseWrapper::CreateInstanceResult status;
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
723 int64_t instanceId;
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
724
2825
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2726
diff changeset
725 // Check whether this instance is already stored
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
726 if (!db_.CreateInstance(status, instanceId, hashPatient,
3082
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
727 hashStudy, hashSeries, hashInstance))
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
728 {
3082
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
729 // The instance already exists
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
730
3813
aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3712
diff changeset
731 if (overwrite)
3082
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
732 {
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
733 // Overwrite the old instance
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
734 LOG(INFO) << "Overwriting instance: " << hashInstance;
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
735 db_.DeleteResource(instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
736
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
737 // Re-create the instance, now that the old one is removed
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
738 if (!db_.CreateInstance(status, instanceId, hashPatient,
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
739 hashStudy, hashSeries, hashInstance))
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
740 {
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
741 throw OrthancException(ErrorCode_InternalError);
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
742 }
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
743 }
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
744 else
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
745 {
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
746 // Do nothing if the instance already exists and overwriting is disabled
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
747 db_.GetAllMetadata(instanceMetadata, instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
748 return StoreStatus_AlreadyStored;
847a0ed92654 new extension for database plugin SDK: createInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3080
diff changeset
749 }
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
750 }
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
751
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
752
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
753 // Warn about the creation of new resources. The order must be
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
754 // from instance to patient.
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
755
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
756 // NB: In theory, could be sped up by grouping the underlying
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
757 // calls to "db_.LogChange()". However, this would only have an
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
758 // impact when new patient/study/series get created, which
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
759 // occurs far less often that creating new instances. The
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
760 // positive impact looks marginal in practice.
4572
c12d4e5f469b removed redundant ServerIndex::SignalNewResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4571
diff changeset
761 LogChange(instanceId, ChangeType_NewInstance, ResourceType_Instance, hashInstance);
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
762
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
763 if (status.isNewSeries_)
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
764 {
4572
c12d4e5f469b removed redundant ServerIndex::SignalNewResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4571
diff changeset
765 LogChange(status.seriesId_, ChangeType_NewSeries, ResourceType_Series, hashSeries);
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
766 }
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
767
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
768 if (status.isNewStudy_)
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
769 {
4572
c12d4e5f469b removed redundant ServerIndex::SignalNewResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4571
diff changeset
770 LogChange(status.studyId_, ChangeType_NewStudy, ResourceType_Study, hashStudy);
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
771 }
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
772
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
773 if (status.isNewPatient_)
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
774 {
4572
c12d4e5f469b removed redundant ServerIndex::SignalNewResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4571
diff changeset
775 LogChange(status.patientId_, ChangeType_NewPatient, ResourceType_Patient, hashPatient);
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
776 }
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
777
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
778
268
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
779 // Ensure there is enough room in the storage for the new instance
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
780 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
781 for (Attachments::const_iterator it = attachments.begin();
656
08eca5d86aad fixes to cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 646
diff changeset
782 it != attachments.end(); ++it)
268
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
783 {
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
784 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
785 }
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
786
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
787 Recycle(instanceSize, hashPatient /* don't consider the current patient for recycling */);
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
788
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
789
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
790 // Attach the files to the newly created instance
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
791 for (Attachments::const_iterator it = attachments.begin();
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
792 it != attachments.end(); ++it)
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
793 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
794 db_.AddAttachment(instanceId, *it);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
795 }
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
796
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
797
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
798 {
3083
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
799 ResourcesContent content;
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
800
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
801 // Populate the tags of the newly-created resources
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
802
3083
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
803 content.AddResource(instanceId, ResourceType_Instance, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
804
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
805 if (status.isNewSeries_)
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
806 {
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
807 content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
808 }
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
809
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
810 if (status.isNewStudy_)
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
811 {
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
812 content.AddResource(status.studyId_, ResourceType_Study, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
813 }
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
814
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
815 if (status.isNewPatient_)
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
816 {
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
817 content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
818 }
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
819
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
820
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
821 // Attach the user-specified metadata
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
822
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
823 for (MetadataMap::const_iterator
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
824 it = metadata.begin(); it != metadata.end(); ++it)
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
825 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
826 switch (it->first.first)
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
827 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
828 case ResourceType_Patient:
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
829 content.AddMetadata(status.patientId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
830 break;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
831
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
832 case ResourceType_Study:
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
833 content.AddMetadata(status.studyId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
834 break;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
835
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
836 case ResourceType_Series:
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
837 content.AddMetadata(status.seriesId_, it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
838 break;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
839
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
840 case ResourceType_Instance:
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
841 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
842 it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
843 break;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
844
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
845 default:
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
846 throw OrthancException(ErrorCode_ParameterOutOfRange);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
847 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
848 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
849
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
850
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
851 // Attach the auto-computed metadata for the patient/study/series levels
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
852 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
853 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
854 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
855 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
856
4460
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
857 if (status.isNewSeries_)
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
858 {
4460
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
859 if (hasExpectedInstances)
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
860 {
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
861 content.AddMetadata(status.seriesId_, MetadataType_Series_ExpectedNumberOfInstances,
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
862 boost::lexical_cast<std::string>(expectedInstances));
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
863 }
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
864
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
865 // New in Orthanc 1.9.0
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
866 content.AddMetadata(status.seriesId_, MetadataType_RemoteAet,
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
867 origin.GetRemoteAetC());
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
868 }
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
869
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
870
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
871 // Attach the auto-computed metadata for the instance level,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
872 // reflecting these additions into the input metadata map
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
873 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
874 MetadataType_Instance_ReceptionDate, now);
4460
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4437
diff changeset
875 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_RemoteAet,
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
876 origin.GetRemoteAetC());
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
877 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_Instance_Origin,
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
878 EnumerationToString(origin.GetRequestOrigin()));
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
879
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
880
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
881 if (hasTransferSyntax)
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
882 {
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
883 // New in Orthanc 1.2.0
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
884 SetInstanceMetadata(content, instanceMetadata, instanceId,
4507
b4c58795f3a8 widening the use of DicomTransferSyntax enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4506
diff changeset
885 MetadataType_Instance_TransferSyntax,
b4c58795f3a8 widening the use of DicomTransferSyntax enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4506
diff changeset
886 GetTransferSyntaxUid(transferSyntax));
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
887 }
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
888
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
889 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
890 std::string s;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
891
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
892 if (origin.LookupRemoteIp(s))
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
893 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
894 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
895 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
896 MetadataType_Instance_RemoteIp, s);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
897 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
898
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
899 if (origin.LookupCalledAet(s))
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
900 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
901 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
902 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
903 MetadataType_Instance_CalledAet, s);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
904 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
905
4506
ac69c9f76c71 refactoring ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4505
diff changeset
906 if (origin.LookupHttpUsername(s))
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
907 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
908 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
909 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
910 MetadataType_Instance_HttpUsername, s);
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
911 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
912 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
913
4514
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
914 if (hasPixelDataOffset)
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
915 {
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
916 // New in Orthanc 1.9.1
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
917 SetInstanceMetadata(content, instanceMetadata, instanceId,
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
918 MetadataType_Instance_PixelDataOffset,
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
919 boost::lexical_cast<std::string>(pixelDataOffset));
5b929e6b3c36 removal of "dicom-as-json" attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4507
diff changeset
920 }
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
921
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
922 const DicomValue* value;
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
923 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
924 !value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
925 !value->IsBinary())
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
926 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
927 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
928 MetadataType_Instance_SopClassUid, value->GetContent());
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
929 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
930
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
931
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
932 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL ||
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
933 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
934 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
935 if (!value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
936 !value->IsBinary())
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
937 {
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
938 SetInstanceMetadata(content, instanceMetadata, instanceId,
4263
61a2bedbae80 sanitize IndexInSeries (we've seen spaces there !)
Alain Mazy <alain@mazy.be>
parents: 4205
diff changeset
939 MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
940 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
941 }
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
942
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
943
3083
683d572424b6 IDatabaseWrapper::SetResourcesContent
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3082
diff changeset
944 db_.SetResourcesContent(content);
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
945 }
3086
74e3e48aa9bd grouping the setting of metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3083
diff changeset
946
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
947
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
948 // Check whether the series of this new instance is now completed
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
949 int64_t expectedNumberOfInstances;
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
950 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary))
205
6ab754744446 logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 204
diff changeset
951 {
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
952 SeriesStatus seriesStatus = GetSeriesStatus(db_, status.seriesId_, expectedNumberOfInstances);
3187
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
953 if (seriesStatus == SeriesStatus_Complete)
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
954 {
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
955 LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries);
4bbadcd03966 refactoring retrieval of metadata from database
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3174
diff changeset
956 }
205
6ab754744446 logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 204
diff changeset
957 }
3087
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3086
diff changeset
958
205
6ab754744446 logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 204
diff changeset
959
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
960 // Mark the parent resources of this instance as unstable
3080
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
961 MarkAsUnstable(status.seriesId_, ResourceType_Series, hashSeries);
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
962 MarkAsUnstable(status.studyId_, ResourceType_Study, hashStudy);
1a75595d8e44 started refactoring of ServerIndex::Store()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3075
diff changeset
963 MarkAsUnstable(status.patientId_, ResourceType_Patient, hashPatient);
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
964
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
965 t.SignalAttachmentsAdded(instanceSize);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
966 t.Commit();
268
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
967
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
968 return StoreStatus_Success;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
969 }
62
a70bb32802ae renaming Server
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 57
diff changeset
970 catch (OrthancException& e)
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
971 {
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
972 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
973 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
974
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
975 return StoreStatus_Failure;
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
976 }
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
977
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
978
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
979 SeriesStatus ServerIndex::GetSeriesStatus(IDatabaseWrapper& db,
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
980 int64_t id,
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
981 int64_t expectedNumberOfInstances)
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
982 {
3091
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
983 std::list<std::string> values;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
984 db.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
985
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
986 std::set<int64_t> instances;
3091
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
987
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
988 for (std::list<std::string>::const_iterator
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
989 it = values.begin(); it != values.end(); ++it)
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
990 {
1238
6c07108ff1e2 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1237
diff changeset
991 int64_t index;
3091
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
992
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
993 try
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
994 {
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
995 index = boost::lexical_cast<int64_t>(*it);
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
996 }
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
997 catch (boost::bad_lexical_cast&)
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
998 {
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
999 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1000 }
3091
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3090
diff changeset
1001
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
1002 if (!(index > 0 && index <= expectedNumberOfInstances))
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1003 {
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1004 // Out-of-range instance index
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1005 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1006 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1007
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1008 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1009 {
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1010 // Twice the same instance index
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1011 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1012 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1013
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1014 instances.insert(index);
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1015 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1016
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
1017 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
199
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1018 {
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1019 return SeriesStatus_Complete;
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1020 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1021 else
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1022 {
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1023 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1024 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1025 }
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1026
dfa2899d9960 refactoring cont
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 198
diff changeset
1027
202
1650557bd81a refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 201
diff changeset
1028 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1029 IDatabaseWrapper& db,
1668
de1413733c97 reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
1030 int64_t resourceId,
de1413733c97 reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1555
diff changeset
1031 ResourceType resourceType)
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
1032 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
1033 DicomMap tags;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1034 db.GetMainDicomTags(tags, resourceId);
1676
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1035
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1036 if (resourceType == ResourceType_Study)
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1037 {
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1038 DicomMap t1, t2;
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1039 tags.ExtractStudyInformation(t1);
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1040 tags.ExtractPatientInformation(t2);
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1041
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1042 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1043 FromDcmtkBridge::ToJson(target["MainDicomTags"], t1, true);
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1044
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1045 target["PatientMainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1046 FromDcmtkBridge::ToJson(target["PatientMainDicomTags"], t2, true);
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1047 }
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1048 else
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1049 {
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1050 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1051 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags, true);
f079f3efe33b patient tags reported in studies
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1668
diff changeset
1052 }
198
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
1053 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 197
diff changeset
1054
3090
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3087
diff changeset
1055
1244
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1056 template <typename T>
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1057 static void FormatLog(Json::Value& target,
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1058 const std::list<T>& log,
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1059 const std::string& name,
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1060 bool done,
3105
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1061 int64_t since,
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1062 bool hasLast,
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1063 int64_t last)
1240
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1064 {
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1065 Json::Value items = Json::arrayValue;
1244
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1066 for (typename std::list<T>::const_iterator
1304
7b6925b0890d cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1300
diff changeset
1067 it = log.begin(); it != log.end(); ++it)
1240
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1068 {
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1069 Json::Value item;
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1070 it->Format(item);
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1071 items.append(item);
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1072 }
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1073
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1074 target = Json::objectValue;
1244
a0e420c5f2b8 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1241
diff changeset
1075 target[name] = items;
1240
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1076 target["Done"] = done;
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1077
3105
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1078 if (!hasLast)
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1079 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1080 // Best-effort guess of the last index in the sequence
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1081 if (log.empty())
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1082 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1083 last = since;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1084 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1085 else
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1086 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1087 last = log.back().GetSeq();
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1088 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1089 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3094
diff changeset
1090
1240
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1091 target["Last"] = static_cast<int>(last);
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1092 }
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1093
62c35e4b67db refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1239
diff changeset
1094
268
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1095 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1096 {
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1097 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1098 {
3020
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
1099 assert(maximumStorageSize_ >= instanceSize);
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
1100
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3019
diff changeset
1101 if (db_.IsDiskSizeAbove(maximumStorageSize_ - instanceSize))
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1102 {
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1103 return true;
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1104 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1105 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1106
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1107 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1108 {
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1109 uint64_t patientCount = db_.GetResourceCount(ResourceType_Patient);
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1110 if (patientCount > maximumPatients_)
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1111 {
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1112 return true;
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1113 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1114 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1115
268
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1116 return false;
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1117 }
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1118
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1119
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1120 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1121 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 264
diff changeset
1122 {
4575
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1123 if (IsRecyclingNeeded(instanceSize))
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1124 {
4575
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1125 // Check whether other DICOM instances from this patient are
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1126 // already stored
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1127 int64_t patientToAvoid;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1128 bool hasPatientToAvoid;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1129
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1130 if (newPatientId.empty())
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1131 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1132 hasPatientToAvoid = false;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1133 }
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1134 else
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1135 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1136 ResourceType type;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1137 hasPatientToAvoid = db_.LookupResource(patientToAvoid, type, newPatientId);
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1138 if (type != ResourceType_Patient)
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1139 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1140 throw OrthancException(ErrorCode_InternalError);
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1141 }
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1142 }
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1143
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1144 // Iteratively select patient to remove until there is enough
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1145 // space in the DICOM store
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1146 int64_t patientToRecycle;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1147 while (true)
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1148 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1149 // If other instances of this patient are already in the store,
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1150 // we must avoid to recycle them
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1151 bool ok = (hasPatientToAvoid ?
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1152 db_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1153 db_.SelectPatientToRecycle(patientToRecycle));
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1154
4575
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1155 if (!ok)
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1156 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1157 throw OrthancException(ErrorCode_FullStorage);
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1158 }
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1159
4575
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1160 LOG(TRACE) << "Recycling one patient";
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1161 db_.DeleteResource(patientToRecycle);
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1162
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1163 if (!IsRecyclingNeeded(instanceSize))
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1164 {
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1165 // OK, we're done
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1166 break;
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1167 }
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1168 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1169 }
4575
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1170 }
e23bacd4fffc clarifications in ServerIndex::Recycle()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4574
diff changeset
1171
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1172
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1173 void ServerIndex::SetMaximumPatientCount(unsigned int count)
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1174 {
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1175 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1176 maximumPatients_ = count;
270
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1177
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1178 if (count == 0)
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1179 {
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1180 LOG(WARNING) << "No limit on the number of stored patients";
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1181 }
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1182 else
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1183 {
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1184 LOG(WARNING) << "At most " << count << " patients will be stored";
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1185 }
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1186
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1187 StandaloneRecycling();
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1188 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1189
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1190 void ServerIndex::SetMaximumStorageSize(uint64_t size)
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1191 {
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1192 boost::mutex::scoped_lock lock(mutex_);
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1193 maximumStorageSize_ = size;
270
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1194
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1195 if (size == 0)
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1196 {
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1197 LOG(WARNING) << "No limit on the size of the storage area";
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1198 }
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1199 else
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1200 {
440
23e5b35e3c5c statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 438
diff changeset
1201 LOG(WARNING) << "At most " << (size / MEGA_BYTES) << "MB will be used for the storage area";
270
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1202 }
e6a4c4329481 parameters for storage capacity
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 269
diff changeset
1203
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1204 StandaloneRecycling();
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1205 }
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1206
2825
8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2726
diff changeset
1207
272
337c506461d2 protection from rest api
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 270
diff changeset
1208 void ServerIndex::StandaloneRecycling()
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1209 {
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1210 // WARNING: No mutex here, do not include this as a public method
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1211 Transaction t(*this, TransactionType_ReadWrite);
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1212 Recycle(0, "");
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
1213 t.Commit();
269
f6fdf5abe751 recycling up and running
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 268
diff changeset
1214 }
272
337c506461d2 protection from rest api
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 270
diff changeset
1215
337c506461d2 protection from rest api
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 270
diff changeset
1216
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
1217 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that,
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
1218 unsigned int threadSleep)
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1219 {
2940
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1220 int stableAge;
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1221
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1222 {
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1223 OrthancConfiguration::ReaderLock lock;
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1224 stableAge = lock.GetConfiguration().GetUnsignedIntegerParameter("StableAge", 60);
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1225 }
4767d36679ed refactoring access to Orthanc configuration
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2898
diff changeset
1226
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1227 if (stableAge <= 0)
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1228 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1229 stableAge = 60;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1230 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1231
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1232 LOG(INFO) << "Starting the monitor for stable resources (stable age = " << stableAge << ")";
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1233
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1234 while (!that->done_)
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1235 {
2665
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
1236 // Check for stable resources each few seconds
389d050a2e66 fix deadlock, speed up unit tests
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 2664
diff changeset
1237 boost::this_thread::sleep(boost::posix_time::milliseconds(threadSleep));
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1238
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1239 boost::mutex::scoped_lock lock(that->mutex_);
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1240
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1241 while (!that->unstableResources_.IsEmpty() &&
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1242 that->unstableResources_.GetOldestPayload().GetAge() > static_cast<unsigned int>(stableAge))
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1243 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1244 // This DICOM resource has not received any new instance for
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1245 // some time. It can be considered as stable.
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1246
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1247 UnstableResourcePayload payload;
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1248 int64_t id = that->unstableResources_.RemoveOldest(payload);
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1249
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1250 // Ensure that the resource is still existing before logging the change
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1251 if (that->db_.IsExistingResource(id))
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1252 {
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1253 switch (payload.GetResourceType())
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1254 {
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1255 case ResourceType_Patient:
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
1256 that->LogChange(id, ChangeType_StablePatient, ResourceType_Patient, payload.GetPublicId());
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1257 break;
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1258
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1259 case ResourceType_Study:
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
1260 that->LogChange(id, ChangeType_StableStudy, ResourceType_Study, payload.GetPublicId());
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1261 break;
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1262
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1263 case ResourceType_Series:
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
1264 that->LogChange(id, ChangeType_StableSeries, ResourceType_Series, payload.GetPublicId());
513
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1265 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1266
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1267 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1268 throw OrthancException(ErrorCode_InternalError);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1269 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1270
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 511
diff changeset
1271 //LOG(INFO) << "Stable resource: " << EnumerationToString(payload.type_) << " " << id;
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1272 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1273 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1274 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1275
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1276 LOG(INFO) << "Closing the monitor thread for stable resources";
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1277 }
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1278
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1279
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1280 void ServerIndex::MarkAsUnstable(int64_t id,
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1281 Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1282 const std::string& publicId)
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1283 {
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1284 // WARNING: Before calling this method, "mutex_" must be locked.
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1285
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1286 assert(type == Orthanc::ResourceType_Patient ||
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1287 type == Orthanc::ResourceType_Study ||
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1288 type == Orthanc::ResourceType_Series);
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1289
1177
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1290 UnstableResourcePayload payload(type, publicId);
5b2d8c280ac2 Plugins can monitor changes through callbacks
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1162
diff changeset
1291 unstableResources_.AddOrMakeMostRecent(id, payload);
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1292 //LOG(INFO) << "Unstable resource: " << EnumerationToString(type) << " " << id;
1189
6b9b02a16e99 NewChildInstance change type
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1177
diff changeset
1293
1237
0f3716b88af7 cleaning
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1236
diff changeset
1294 LogChange(id, ChangeType_NewChildInstance, type, publicId);
511
3b735fdf320b monitoring of stable patients/studies/series
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 440
diff changeset
1295 }
521
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 513
diff changeset
1296
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 513
diff changeset
1297
2c739f76d0bb lookup tag values
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 513
diff changeset
1298
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1299 StoreStatus ServerIndex::AddAttachment(const FileInfo& attachment,
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1300 const std::string& publicId)
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1301 {
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1302 boost::mutex::scoped_lock lock(mutex_);
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1303
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1304 Transaction t(*this, TransactionType_ReadWrite);
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1305
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1306 ResourceType resourceType;
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1307 int64_t resourceId;
1294
910478b2d4e4 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1288
diff changeset
1308 if (!db_.LookupResource(resourceId, resourceType, publicId))
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1309 {
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1310 return StoreStatus_Failure; // Inexistent resource
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1311 }
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1312
704
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1313 // Remove possible previous attachment
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1314 db_.DeleteAttachment(resourceId, attachment.GetContentType());
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1315
704
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1316 // Locate the patient of the target resource
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1317 int64_t patientId = resourceId;
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1318 for (;;)
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1319 {
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1320 int64_t parent;
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1321 if (db_.LookupParent(parent, patientId))
704
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1322 {
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1323 // We have not reached the patient level yet
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1324 patientId = parent;
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1325 }
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1326 else
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1327 {
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1328 // We have reached the patient level
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1329 break;
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1330 }
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1331 }
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1332
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1333 // Possibly apply the recycling mechanism while preserving this patient
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1334 assert(db_.GetResourceType(patientId) == ResourceType_Patient);
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1335 Recycle(attachment.GetCompressedSize(), db_.GetPublicId(patientId));
704
4789da60d655 recycling with custom attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 702
diff changeset
1336
1247
32fcc5dc7562 abstraction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1246
diff changeset
1337 db_.AddAttachment(resourceId, attachment);
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1338
1773
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1757
diff changeset
1339 if (IsUserContentType(attachment.GetContentType()))
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1757
diff changeset
1340 {
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1757
diff changeset
1341 LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId);
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1757
diff changeset
1342 }
613df4362575 New UpdatedAttachment and UpdatedMetadata events in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1757
diff changeset
1343
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
1344 t.SignalAttachmentsAdded(attachment.GetCompressedSize());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
1345 t.Commit();
699
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1346
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1347 return StoreStatus_Success;
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1348 }
2929e17f8447 add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 697
diff changeset
1349
702
7592a48e97e4 delete custom attachment
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 701
diff changeset
1350
3029
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1351 void ServerIndex::NormalizeLookup(std::vector<DatabaseConstraint>& target,
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1352 const DatabaseLookup& source,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1353 ResourceType queryLevel) const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1354 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1355 assert(mainDicomTagsRegistry_.get() != NULL);
3029
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1356
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1357 target.clear();
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1358 target.reserve(source.GetConstraintsCount());
3031
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1359
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1360 for (size_t i = 0; i < source.GetConstraintsCount(); i++)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1361 {
3031
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1362 ResourceType level;
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1363 DicomTagType type;
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1364
3031
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1365 mainDicomTagsRegistry_->LookupTag(level, type, source.GetConstraint(i).GetTag());
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1366
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1367 if (type == DicomTagType_Identifier ||
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1368 type == DicomTagType_Main)
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1369 {
3029
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1370 // Use the fact that patient-level tags are copied at the study level
3031
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1371 if (level == ResourceType_Patient &&
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1372 queryLevel != ResourceType_Patient)
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1373 {
3031
18a2d196414b simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3030
diff changeset
1374 level = ResourceType_Study;
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1375 }
3029
ea653ec47f31 new class: DatabaseConstraint
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3027
diff changeset
1376
3073
0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3061
diff changeset
1377 target.push_back(source.GetConstraint(i).ConvertToDatabaseConstraint(level, type));
3027
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1378 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1379 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1380 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1381
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 3025
diff changeset
1382
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1383
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1384
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1385
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1386 /***
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1387 ** PROTOTYPING FOR DB REFACTORING BELOW
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1388 ***/
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1389
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1390 namespace
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1391 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1392 /**
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1393 * Some handy templates to reduce the verbosity in the definitions
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1394 * of the internal classes.
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1395 **/
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1396
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1397 template <typename Operations,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1398 typename Tuple>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1399 class TupleOperationsWrapper : public ServerIndex::IReadOnlyOperations
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1400 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1401 protected:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1402 Operations& operations_;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1403 const Tuple& tuple_;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1404
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1405 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1406 TupleOperationsWrapper(Operations& operations,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1407 const Tuple& tuple) :
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1408 operations_(operations),
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1409 tuple_(tuple)
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1410 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1411 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1412
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1413 virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1414 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1415 operations_.ApplyTuple(transaction, tuple_);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1416 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1417 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1418
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1419
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1420 template <typename T1>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1421 class ReadOnlyOperationsT1 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1422 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1423 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1424 typedef typename boost::tuple<T1> Tuple;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1425
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1426 virtual ~ReadOnlyOperationsT1()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1427 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1428 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1429
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1430 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1431 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1432
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1433 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1434 T1 t1)
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1435 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1436 const Tuple tuple(t1);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1437 TupleOperationsWrapper<ReadOnlyOperationsT1, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1438 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1439 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1440 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1441
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1442
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1443 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1444 typename T2>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1445 class ReadOnlyOperationsT2 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1446 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1447 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1448 typedef typename boost::tuple<T1, T2> Tuple;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1449
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1450 virtual ~ReadOnlyOperationsT2()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1451 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1452 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1453
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1454 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1455 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1456
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1457 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1458 T1 t1,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1459 T2 t2)
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1460 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1461 const Tuple tuple(t1, t2);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1462 TupleOperationsWrapper<ReadOnlyOperationsT2, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1463 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1464 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1465 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1466
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1467
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1468 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1469 typename T2,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1470 typename T3>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1471 class ReadOnlyOperationsT3 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1472 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1473 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1474 typedef typename boost::tuple<T1, T2, T3> Tuple;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1475
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1476 virtual ~ReadOnlyOperationsT3()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1477 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1478 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1479
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1480 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1481 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1482
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1483 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1484 T1 t1,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1485 T2 t2,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1486 T3 t3)
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1487 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1488 const Tuple tuple(t1, t2, t3);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1489 TupleOperationsWrapper<ReadOnlyOperationsT3, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1490 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1491 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1492 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1493
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1494
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1495 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1496 typename T2,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1497 typename T3,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1498 typename T4>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1499 class ReadOnlyOperationsT4 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1500 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1501 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1502 typedef typename boost::tuple<T1, T2, T3, T4> Tuple;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1503
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1504 virtual ~ReadOnlyOperationsT4()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1505 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1506 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1507
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1508 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1509 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1510
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1511 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1512 T1 t1,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1513 T2 t2,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1514 T3 t3,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1515 T4 t4)
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1516 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1517 const Tuple tuple(t1, t2, t3, t4);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1518 TupleOperationsWrapper<ReadOnlyOperationsT4, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1519 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1520 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1521 };
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1522
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1523
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1524 template <typename T1,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1525 typename T2,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1526 typename T3,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1527 typename T4,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1528 typename T5>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1529 class ReadOnlyOperationsT5 : public boost::noncopyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1530 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1531 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1532 typedef typename boost::tuple<T1, T2, T3, T4, T5> Tuple;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1533
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1534 virtual ~ReadOnlyOperationsT5()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1535 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1536 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1537
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1538 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1539 const Tuple& tuple) = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1540
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1541 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1542 T1 t1,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1543 T2 t2,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1544 T3 t3,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1545 T4 t4,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1546 T5 t5)
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1547 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1548 const Tuple tuple(t1, t2, t3, t4, t5);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1549 TupleOperationsWrapper<ReadOnlyOperationsT5, Tuple> wrapper(*this, tuple);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1550 index.Apply(wrapper);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1551 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1552 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1553
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1554
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1555 template <typename T1,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1556 typename T2,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1557 typename T3,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1558 typename T4,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1559 typename T5,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1560 typename T6>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1561 class ReadOnlyOperationsT6 : public boost::noncopyable
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1562 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1563 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1564 typedef typename boost::tuple<T1, T2, T3, T4, T5, T6> Tuple;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1565
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1566 virtual ~ReadOnlyOperationsT6()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1567 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1568 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1569
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1570 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1571 const Tuple& tuple) = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1572
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1573 void Apply(ServerIndex& index,
4566
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1574 T1 t1,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1575 T2 t2,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1576 T3 t3,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1577 T4 t4,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1578 T5 t5,
f52d0bc19e07 fix build for msvc2008
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4565
diff changeset
1579 T6 t6)
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1580 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1581 const Tuple tuple(t1, t2, t3, t4, t5, t6);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1582 TupleOperationsWrapper<ReadOnlyOperationsT6, Tuple> wrapper(*this, tuple);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1583 index.Apply(wrapper);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1584 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1585 };
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1586 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1587
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1588
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1589 void ServerIndex::ApplyInternal(IReadOnlyOperations* readOperations,
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1590 IReadWriteOperations* writeOperations)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1591 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1592 if ((readOperations == NULL && writeOperations == NULL) ||
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1593 (readOperations != NULL && writeOperations != NULL))
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1594 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1595 throw OrthancException(ErrorCode_InternalError);
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1596 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1597
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1598 unsigned int count = 0;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1599
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1600 for (;;)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1601 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1602 try
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1603 {
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1604 boost::mutex::scoped_lock lock(mutex_); // TODO - REMOVE
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1605
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1606 if (readOperations != NULL)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1607 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1608 /**
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1609 * IMPORTANT: In Orthanc <= 1.9.1, there was no transaction
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1610 * in this case. This was OK because of the presence of the
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1611 * global mutex protecting the database.
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1612 **/
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1613
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1614 Transaction transaction(*this, TransactionType_ReadOnly); // TODO - Only if not "TransactionType_Implicit"
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1615 {
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1616 ReadOnlyTransaction t(db_);
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1617 readOperations->Apply(t);
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1618 }
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
1619 transaction.Commit();
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1620 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1621 else
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1622 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1623 assert(writeOperations != NULL);
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1624
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1625 Transaction transaction(*this, TransactionType_ReadWrite);
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1626 {
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
1627 assert(listener_.get() != NULL);
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
1628 ReadWriteTransaction t(db_, *listener_, *this);
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
1629 writeOperations->Apply(t);
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1630 }
4576
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4575
diff changeset
1631 transaction.Commit();
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1632 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1633
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1634 return; // Success
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1635 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1636 catch (OrthancException& e)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1637 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1638 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1639 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1640 if (count == maxRetries_)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1641 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1642 throw;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1643 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1644 else
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1645 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1646 count++;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1647 boost::this_thread::sleep(boost::posix_time::milliseconds(100 * count));
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1648 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1649 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1650 else if (e.GetErrorCode() == ErrorCode_DatabaseUnavailable)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1651 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1652 if (count == maxRetries_)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1653 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1654 throw;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1655 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1656 else
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1657 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1658 count++;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1659 boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1660 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1661 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1662 else
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1663 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1664 throw;
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1665 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1666 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1667 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1668 }
4561
02510325d869 removed function wrappers for transactions in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4560
diff changeset
1669
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1670
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1671 void ServerIndex::Apply(IReadOnlyOperations& operations)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1672 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1673 ApplyInternal(&operations, NULL);
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1674 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1675
4561
02510325d869 removed function wrappers for transactions in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4560
diff changeset
1676
4551
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1677 void ServerIndex::Apply(IReadWriteOperations& operations)
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1678 {
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1679 ApplyInternal(NULL, &operations);
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1680 }
350a22c094f2 testing replay of transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4514
diff changeset
1681
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1682
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1683 bool ServerIndex::ExpandResource(Json::Value& target,
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1684 const std::string& publicId,
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1685 ResourceType level)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1686 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1687 class Operations : public ReadOnlyOperationsT4<bool&, Json::Value&, const std::string&, ResourceType>
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1688 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1689 private:
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
1690 ServerIndex& index_; // TODO - REMOVE
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1691
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1692 public:
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1693 explicit Operations(ServerIndex& index) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1694 index_(index)
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1695 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1696 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1697
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1698 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1699 const Tuple& tuple) ORTHANC_OVERRIDE
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1700 {
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1701 // Lookup for the requested resource
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1702 int64_t internalId; // unused
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1703 ResourceType type;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1704 std::string parent;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1705 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1706 type != tuple.get<3>())
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1707 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1708 tuple.get<0>() = false;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1709 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1710 else
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1711 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1712 Json::Value& target = tuple.get<1>();
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1713 target = Json::objectValue;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1714
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1715 // Set information about the parent resource (if it exists)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1716 if (type == ResourceType_Patient)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1717 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1718 if (!parent.empty())
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1719 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1720 throw OrthancException(ErrorCode_DatabasePlugin);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1721 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1722 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1723 else
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1724 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1725 if (parent.empty())
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1726 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1727 throw OrthancException(ErrorCode_DatabasePlugin);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1728 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1729
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1730 switch (type)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1731 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1732 case ResourceType_Study:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1733 target["ParentPatient"] = parent;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1734 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1735
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1736 case ResourceType_Series:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1737 target["ParentStudy"] = parent;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1738 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1739
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1740 case ResourceType_Instance:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1741 target["ParentSeries"] = parent;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1742 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1743
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1744 default:
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1745 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1746 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1747 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1748
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1749 // List the children resources
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1750 std::list<std::string> children;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1751 transaction.GetChildrenPublicId(children, internalId);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1752
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1753 if (type != ResourceType_Instance)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1754 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1755 Json::Value c = Json::arrayValue;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1756
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1757 for (std::list<std::string>::const_iterator
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1758 it = children.begin(); it != children.end(); ++it)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1759 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1760 c.append(*it);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1761 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1762
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1763 switch (type)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1764 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1765 case ResourceType_Patient:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1766 target["Studies"] = c;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1767 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1768
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1769 case ResourceType_Study:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1770 target["Series"] = c;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1771 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1772
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1773 case ResourceType_Series:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1774 target["Instances"] = c;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1775 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1776
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1777 default:
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1778 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1779 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1780 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1781
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1782 // Extract the metadata
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1783 std::map<MetadataType, std::string> metadata;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1784 transaction.GetAllMetadata(metadata, internalId);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1785
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1786 // Set the resource type
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1787 switch (type)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1788 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1789 case ResourceType_Patient:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1790 target["Type"] = "Patient";
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1791 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1792
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1793 case ResourceType_Study:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1794 target["Type"] = "Study";
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1795 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1796
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1797 case ResourceType_Series:
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1798 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1799 target["Type"] = "Series";
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1800
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1801 int64_t i;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1802 if (LookupIntegerMetadata(i, metadata, MetadataType_Series_ExpectedNumberOfInstances))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1803 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1804 target["ExpectedNumberOfInstances"] = static_cast<int>(i);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1805 target["Status"] = EnumerationToString(transaction.GetSeriesStatus(internalId, i));
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1806 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1807 else
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1808 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1809 target["ExpectedNumberOfInstances"] = Json::nullValue;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1810 target["Status"] = EnumerationToString(SeriesStatus_Unknown);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1811 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1812
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1813 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1814 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1815
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1816 case ResourceType_Instance:
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1817 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1818 target["Type"] = "Instance";
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1819
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1820 FileInfo attachment;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1821 if (!transaction.LookupAttachment(attachment, internalId, FileContentType_Dicom))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1822 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1823 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1824 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1825
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1826 target["FileSize"] = static_cast<unsigned int>(attachment.GetUncompressedSize());
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1827 target["FileUuid"] = attachment.GetUuid();
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1828
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1829 int64_t i;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1830 if (LookupIntegerMetadata(i, metadata, MetadataType_Instance_IndexInSeries))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1831 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1832 target["IndexInSeries"] = static_cast<int>(i);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1833 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1834 else
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1835 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1836 target["IndexInSeries"] = Json::nullValue;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1837 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1838
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1839 break;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1840 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1841
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1842 default:
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1843 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1844 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1845
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1846 // Record the remaining information
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1847 target["ID"] = tuple.get<2>();
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1848 transaction.MainDicomTagsToJson(target, internalId, type);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1849
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1850 std::string tmp;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1851
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1852 if (LookupStringMetadata(tmp, metadata, MetadataType_AnonymizedFrom))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1853 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1854 target["AnonymizedFrom"] = tmp;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1855 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1856
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1857 if (LookupStringMetadata(tmp, metadata, MetadataType_ModifiedFrom))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1858 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1859 target["ModifiedFrom"] = tmp;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1860 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1861
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1862 if (type == ResourceType_Patient ||
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1863 type == ResourceType_Study ||
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1864 type == ResourceType_Series)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1865 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1866 target["IsStable"] = !index_.IsUnstableResource(internalId);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1867
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1868 if (LookupStringMetadata(tmp, metadata, MetadataType_LastUpdate))
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1869 {
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1870 target["LastUpdate"] = tmp;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1871 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1872 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1873
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1874 tuple.get<0>() = true;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1875 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1876 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1877 };
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1878
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1879 bool found;
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1880 Operations operations(*this);
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1881 operations.Apply(*this, found, target, publicId, level);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1882 return found;
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1883 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1884
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1885
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1886 void ServerIndex::GetAllMetadata(std::map<MetadataType, std::string>& target,
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1887 const std::string& publicId,
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1888 ResourceType level)
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1889 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1890 class Operations : public ReadOnlyOperationsT3<std::map<MetadataType, std::string>&, const std::string&, ResourceType>
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1891 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1892 public:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1893 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1894 const Tuple& tuple) ORTHANC_OVERRIDE
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1895 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1896 ResourceType type;
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1897 int64_t id;
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1898 if (!transaction.LookupResource(id, type, tuple.get<1>()) ||
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1899 tuple.get<2>() != type)
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1900 {
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1901 throw OrthancException(ErrorCode_UnknownResource);
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1902 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1903 else
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1904 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1905 transaction.GetAllMetadata(tuple.get<0>(), id);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1906 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1907 }
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1908 };
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1909
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1910 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1911 operations.Apply(*this, target, publicId, level);
4554
efd90f778cd2 simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4551
diff changeset
1912 }
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1913
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1914
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1915 bool ServerIndex::LookupAttachment(FileInfo& attachment,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1916 const std::string& instancePublicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1917 FileContentType contentType)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1918 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1919 class Operations : public ReadOnlyOperationsT4<bool&, FileInfo&, const std::string&, FileContentType>
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1920 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1921 public:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1922 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1923 const Tuple& tuple) ORTHANC_OVERRIDE
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1924 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1925 int64_t internalId;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1926 ResourceType type;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1927 if (!transaction.LookupResource(internalId, type, tuple.get<2>()))
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1928 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1929 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1930 }
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1931 else if (transaction.LookupAttachment(tuple.get<1>(), internalId, tuple.get<3>()))
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1932 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1933 assert(tuple.get<1>().GetContentType() == tuple.get<3>());
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1934 tuple.get<0>() = true;
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1935 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1936 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1937 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1938 tuple.get<0>() = false;
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1939 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1940 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1941 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1942
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1943 bool found;
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1944 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1945 operations.Apply(*this, found, attachment, instancePublicId, contentType);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
1946 return found;
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1947 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1948
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1949
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1950 void ServerIndex::GetAllUuids(std::list<std::string>& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1951 ResourceType resourceType)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1952 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1953 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, ResourceType>
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1954 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1955 public:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1956 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1957 const Tuple& tuple) ORTHANC_OVERRIDE
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1958 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1959 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1960 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>());
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1961 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1962 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1963
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1964 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1965 operations.Apply(*this, target, resourceType);
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1966 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1967
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1968
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1969 void ServerIndex::GetAllUuids(std::list<std::string>& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1970 ResourceType resourceType,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1971 size_t since,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1972 size_t limit)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1973 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1974 if (limit == 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1975 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1976 target.clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1977 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1978 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1979 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1980 class Operations : public ReadOnlyOperationsT4<std::list<std::string>&, ResourceType, size_t, size_t>
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1981 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1982 public:
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1983 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1984 const Tuple& tuple) ORTHANC_OVERRIDE
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1985 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
1986 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1987 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1988 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1989 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1990
4557
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4556
diff changeset
1991 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
1992 operations.Apply(*this, target, resourceType, since, limit);
4555
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1993 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4554
diff changeset
1994 }
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1995
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1996
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1997 void ServerIndex::GetGlobalStatistics(/* out */ uint64_t& diskSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1998 /* out */ uint64_t& uncompressedSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
1999 /* out */ uint64_t& countPatients,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2000 /* out */ uint64_t& countStudies,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2001 /* out */ uint64_t& countSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2002 /* out */ uint64_t& countInstances)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2003 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2004 class Operations : public ReadOnlyOperationsT6<uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&>
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2005 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2006 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2007 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2008 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2009 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2010 tuple.get<0>() = transaction.GetTotalCompressedSize();
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2011 tuple.get<1>() = transaction.GetTotalUncompressedSize();
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2012 tuple.get<2>() = transaction.GetResourceCount(ResourceType_Patient);
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2013 tuple.get<3>() = transaction.GetResourceCount(ResourceType_Study);
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2014 tuple.get<4>() = transaction.GetResourceCount(ResourceType_Series);
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2015 tuple.get<5>() = transaction.GetResourceCount(ResourceType_Instance);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2016 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2017 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2018
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2019 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2020 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2021 countStudies, countSeries, countInstances);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2022 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2025 void ServerIndex::GetChanges(Json::Value& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2026 int64_t since,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2027 unsigned int maxResults)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2028 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2029 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2030 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2031 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2032 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2033 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2034 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2035 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2036 // "GetLastChange()" involves calls to "GetPublicId()"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2037
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2038 std::list<ServerIndexChange> changes;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2039 bool done;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2040 bool hasLast = false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2041 int64_t last = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2042
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2043 transaction.GetChanges(changes, done, tuple.get<1>(), tuple.get<2>());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2044 if (changes.empty())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2045 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2046 last = transaction.GetLastChangeIndex();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2047 hasLast = true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2048 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2049
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2050 FormatLog(tuple.get<0>(), changes, "Changes", done, tuple.get<1>(), hasLast, last);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2051 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2052 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2053
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2054 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2055 operations.Apply(*this, target, since, maxResults);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2056 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2057
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2058
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2059 void ServerIndex::GetLastChange(Json::Value& target)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2060 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2061 class Operations : public ReadOnlyOperationsT1<Json::Value&>
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2062 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2063 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2064 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2065 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2066 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2067 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2068 // "GetLastChange()" involves calls to "GetPublicId()"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2069
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2070 std::list<ServerIndexChange> changes;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2071 bool hasLast = false;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2072 int64_t last = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2073
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2074 transaction.GetLastChange(changes);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2075 if (changes.empty())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2076 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2077 last = transaction.GetLastChangeIndex();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2078 hasLast = true;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2079 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2080
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2081 FormatLog(tuple.get<0>(), changes, "Changes", true, 0, hasLast, last);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2082 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2083 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2084
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2085 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2086 operations.Apply(*this, target);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2087 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2088
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2089
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2090 void ServerIndex::GetExportedResources(Json::Value& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2091 int64_t since,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2092 unsigned int maxResults)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2093 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2094 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2095 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2096 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2097 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2098 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2099 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2100 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2101
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2102 std::list<ExportedResource> exported;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2103 bool done;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2104 transaction.GetExportedResources(exported, done, tuple.get<1>(), tuple.get<2>());
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2105 FormatLog(tuple.get<0>(), exported, "Exports", done, tuple.get<1>(), false, -1);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2106 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2107 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2108
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2109 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2110 operations.Apply(*this, target, since, maxResults);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2111 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2112
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2113
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2114 void ServerIndex::GetLastExportedResource(Json::Value& target)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2115 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2116 class Operations : public ReadOnlyOperationsT1<Json::Value&>
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2117 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2118 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2119 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2120 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2121 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2122 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2123
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2124 std::list<ExportedResource> exported;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2125 transaction.GetLastExportedResource(exported);
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2126 FormatLog(tuple.get<0>(), exported, "Exports", true, 0, false, -1);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2127 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2128 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2129
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2130 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2131 operations.Apply(*this, target);
4558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4557
diff changeset
2132 }
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2133
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2134
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2135 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2136 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2137 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2138 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2139 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2140 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2141 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2142 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2143 // Lookup for the requested resource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2144 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2145 ResourceType type;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2146 if (!transaction.LookupResource(id, type, tuple.get<1>()) ||
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2147 type != ResourceType_Patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2148 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2149 throw OrthancException(ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2150 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2151 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2152 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2153 tuple.get<0>() = transaction.IsProtectedPatient(id);
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2154 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2155 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2156 };
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2157
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2158 bool isProtected;
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2159 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2160 operations.Apply(*this, isProtected, publicId);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2161 return isProtected;
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2162 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2163
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2164
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2165 void ServerIndex::GetChildren(std::list<std::string>& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2166 const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2167 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2168 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2169 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2170 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2171 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2172 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2173 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2174 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2175 int64_t resource;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2176 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2177 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2178 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2179 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2180 else if (type == ResourceType_Instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2181 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2182 // An instance cannot have a child
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2183 throw OrthancException(ErrorCode_BadParameterType);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2184 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2185 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2186 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2187 std::list<int64_t> tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2188 transaction.GetChildrenInternalId(tmp, resource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2189
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2190 tuple.get<0>().clear();
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2191
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2192 for (std::list<int64_t>::const_iterator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2193 it = tmp.begin(); it != tmp.end(); ++it)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2194 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2195 tuple.get<0>().push_back(transaction.GetPublicId(*it));
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2196 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2197 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2198 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2199 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2200
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2201 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2202 operations.Apply(*this, result, publicId);
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2203 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2204
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2205
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2206 void ServerIndex::GetChildInstances(std::list<std::string>& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2207 const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2208 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2209 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2210 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2211 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2212 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2213 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2214 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2215 tuple.get<0>().clear();
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2216
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2217 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2218 int64_t top;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2219 if (!transaction.LookupResource(top, type, tuple.get<1>()))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2220 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2221 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2222 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2223 else if (type == ResourceType_Instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2224 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2225 // The resource is already an instance: Do not go down the hierarchy
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2226 tuple.get<0>().push_back(tuple.get<1>());
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2227 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2228 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2229 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2230 std::stack<int64_t> toExplore;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2231 toExplore.push(top);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2232
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2233 std::list<int64_t> tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2234 while (!toExplore.empty())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2235 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2236 // Get the internal ID of the current resource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2237 int64_t resource = toExplore.top();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2238 toExplore.pop();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2239
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2240 // TODO - This could be optimized by seeing how many
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2241 // levels "type == transaction.GetResourceType(top)" is
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2242 // above the "instances level"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2243 if (transaction.GetResourceType(resource) == ResourceType_Instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2244 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2245 tuple.get<0>().push_back(transaction.GetPublicId(resource));
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2246 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2247 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2248 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2249 // Tag all the children of this resource as to be explored
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2250 transaction.GetChildrenInternalId(tmp, resource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2251 for (std::list<int64_t>::const_iterator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2252 it = tmp.begin(); it != tmp.end(); ++it)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2253 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2254 toExplore.push(*it);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2255 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2256 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2257 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2258 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2259 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2260 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2261
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2262 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2263 operations.Apply(*this, result, publicId);
4559
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4558
diff changeset
2264 }
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2265
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2266
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2267 bool ServerIndex::LookupMetadata(std::string& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2268 const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2269 ResourceType expectedType,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2270 MetadataType type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2271 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2272 class Operations : public ReadOnlyOperationsT5<bool&, std::string&, const std::string&, ResourceType, MetadataType>
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2273 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2274 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2275 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2276 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2277 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2278 ResourceType rtype;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2279 int64_t id;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2280 if (!transaction.LookupResource(id, rtype, tuple.get<2>()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2281 rtype != tuple.get<3>())
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2282 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2283 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2284 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2285 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2286 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2287 tuple.get<0>() = transaction.LookupMetadata(tuple.get<1>(), id, tuple.get<4>());
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2288 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2289 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2290 };
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2291
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2292 bool found;
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2293 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2294 operations.Apply(*this, found, target, publicId, expectedType, type);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2295 return found;
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2296 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2297
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2298
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2299 void ServerIndex::ListAvailableAttachments(std::set<FileContentType>& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2300 const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2301 ResourceType expectedType)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2302 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2303 class Operations : public ReadOnlyOperationsT3<std::set<FileContentType>&, const std::string&, ResourceType>
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2304 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2305 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2306 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2307 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2308 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2309 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2310 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2311 if (!transaction.LookupResource(id, type, tuple.get<1>()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2312 tuple.get<2>() != type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2313 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2314 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2315 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2316 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2317 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2318 transaction.ListAvailableAttachments(tuple.get<0>(), id);
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2319 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2320 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2321 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2322
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2323 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2324 operations.Apply(*this, target, publicId, expectedType);
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2325 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2326
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2327
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2328 bool ServerIndex::LookupParent(std::string& target,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2329 const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2330 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2331 class Operations : public ReadOnlyOperationsT3<bool&, std::string&, const std::string&>
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2332 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2333 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2334 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2335 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2336 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2337 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2338 int64_t id;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2339 if (!transaction.LookupResource(id, type, tuple.get<2>()))
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2340 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2341 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2342 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2343 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2344 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2345 int64_t parentId;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2346 if (transaction.LookupParent(parentId, id))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2347 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2348 tuple.get<1>() = transaction.GetPublicId(parentId);
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2349 tuple.get<0>() = true;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2350 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2351 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2352 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2353 tuple.get<0>() = false;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2354 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2355 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2356 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2357 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2358
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2359 bool found;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2360 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2361 operations.Apply(*this, found, target, publicId);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2362 return found;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2363 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2364
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2365
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2366 void ServerIndex::GetResourceStatistics(/* out */ ResourceType& type,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2367 /* out */ uint64_t& diskSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2368 /* out */ uint64_t& uncompressedSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2369 /* out */ unsigned int& countStudies,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2370 /* out */ unsigned int& countSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2371 /* out */ unsigned int& countInstances,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2372 /* out */ uint64_t& dicomDiskSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2373 /* out */ uint64_t& dicomUncompressedSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2374 const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2375 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2376 class Operations : public ServerIndex::IReadOnlyOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2377 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2378 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2379 ResourceType& type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2380 uint64_t& diskSize_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2381 uint64_t& uncompressedSize_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2382 unsigned int& countStudies_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2383 unsigned int& countSeries_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2384 unsigned int& countInstances_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2385 uint64_t& dicomDiskSize_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2386 uint64_t& dicomUncompressedSize_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2387 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2388
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2389 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2390 explicit Operations(ResourceType& type,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2391 uint64_t& diskSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2392 uint64_t& uncompressedSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2393 unsigned int& countStudies,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2394 unsigned int& countSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2395 unsigned int& countInstances,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2396 uint64_t& dicomDiskSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2397 uint64_t& dicomUncompressedSize,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2398 const std::string& publicId) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2399 type_(type),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2400 diskSize_(diskSize),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2401 uncompressedSize_(uncompressedSize),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2402 countStudies_(countStudies),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2403 countSeries_(countSeries),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2404 countInstances_(countInstances),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2405 dicomDiskSize_(dicomDiskSize),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2406 dicomUncompressedSize_(dicomUncompressedSize),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2407 publicId_(publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2408 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2409 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2410
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2411 virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2412 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2413 int64_t top;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2414 if (!transaction.LookupResource(top, type_, publicId_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2415 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2416 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2417 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2418 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2419 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2420 countInstances_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2421 countSeries_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2422 countStudies_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2423 diskSize_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2424 uncompressedSize_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2425 dicomDiskSize_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2426 dicomUncompressedSize_ = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2427
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2428 std::stack<int64_t> toExplore;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2429 toExplore.push(top);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2430
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2431 while (!toExplore.empty())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2432 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2433 // Get the internal ID of the current resource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2434 int64_t resource = toExplore.top();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2435 toExplore.pop();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2436
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2437 ResourceType thisType = transaction.GetResourceType(resource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2438
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2439 std::set<FileContentType> f;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2440 transaction.ListAvailableAttachments(f, resource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2441
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2442 for (std::set<FileContentType>::const_iterator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2443 it = f.begin(); it != f.end(); ++it)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2444 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2445 FileInfo attachment;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2446 if (transaction.LookupAttachment(attachment, resource, *it))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2447 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2448 if (attachment.GetContentType() == FileContentType_Dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2449 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2450 dicomDiskSize_ += attachment.GetCompressedSize();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2451 dicomUncompressedSize_ += attachment.GetUncompressedSize();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2452 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2453
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2454 diskSize_ += attachment.GetCompressedSize();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2455 uncompressedSize_ += attachment.GetUncompressedSize();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2456 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2457 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2458
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2459 if (thisType == ResourceType_Instance)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2460 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2461 countInstances_++;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2462 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2463 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2464 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2465 switch (thisType)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2466 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2467 case ResourceType_Study:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2468 countStudies_++;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2469 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2470
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2471 case ResourceType_Series:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2472 countSeries_++;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2473 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2474
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2475 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2476 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2477 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2478
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2479 // Tag all the children of this resource as to be explored
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2480 std::list<int64_t> tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2481 transaction.GetChildrenInternalId(tmp, resource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2482 for (std::list<int64_t>::const_iterator
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2483 it = tmp.begin(); it != tmp.end(); ++it)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2484 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2485 toExplore.push(*it);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2486 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2487 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2488 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2489
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2490 if (countStudies_ == 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2491 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2492 countStudies_ = 1;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2493 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2494
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2495 if (countSeries_ == 0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2496 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2497 countSeries_ = 1;
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2498 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2499 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2500 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2501 };
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2502
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2503 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2504 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2505 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2506 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2507
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2508
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2509 void ServerIndex::LookupIdentifierExact(std::vector<std::string>& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2510 ResourceType level,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2511 const DicomTag& tag,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2512 const std::string& value)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2513 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2514 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2515 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2516 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2517 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2518 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2519
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2520 result.clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2521
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2522 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2523
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2524 std::vector<DatabaseConstraint> query;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2525 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2526
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2527
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2528 class Operations : public ServerIndex::IReadOnlyOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2529 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2530 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2531 std::vector<std::string>& result_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2532 const std::vector<DatabaseConstraint>& query_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2533 ResourceType level_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2534
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2535 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2536 Operations(std::vector<std::string>& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2537 const std::vector<DatabaseConstraint>& query,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2538 ResourceType level) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2539 result_(result),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2540 query_(query),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2541 level_(level)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2542 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2543 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2544
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2545 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2546 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2547 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2548 std::list<std::string> tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2549 transaction.ApplyLookupResources(tmp, NULL, query_, level_, 0);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2550 CopyListToVector(result_, tmp);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2551 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2552 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2553
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2554 Operations operations(result, query, level);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2555 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2556 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2557
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2558
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2559 bool ServerIndex::LookupGlobalProperty(std::string& value,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2560 GlobalProperty property)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2561 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2562 class Operations : public ReadOnlyOperationsT3<bool&, std::string&, GlobalProperty>
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2563 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2564 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2565 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2566 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2567 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2568 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2569 tuple.get<0>() = transaction.LookupGlobalProperty(tuple.get<1>(), tuple.get<2>());
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2570 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2571 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2572
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2573 bool found;
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2574 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2575 operations.Apply(*this, found, value, property);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2576 return found;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2577 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2578
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2579
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2580 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2581 const std::string& defaultValue)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2582 {
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2583 std::string s;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2584 if (LookupGlobalProperty(s, property))
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2585 {
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2586 return s;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2587 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2588 else
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2589 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2590 return defaultValue;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2591 }
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2592 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2593
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2594
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2595 bool ServerIndex::GetMainDicomTags(DicomMap& result,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2596 const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2597 ResourceType expectedType,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2598 ResourceType levelOfInterest)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2599 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2600 // Yes, the following test could be shortened, but we wish to make it as clear as possible
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2601 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2602 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2603 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2604 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2605 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2606 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2607 throw OrthancException(ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2608 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2609
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2610
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2611 class Operations : public ReadOnlyOperationsT5<bool&, DicomMap&, const std::string&, ResourceType, ResourceType>
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2612 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2613 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2614 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2615 const Tuple& tuple) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2616 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2617 // Lookup for the requested resource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2618 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2619 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2620 if (!transaction.LookupResource(id, type, tuple.get<2>()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2621 type != tuple.get<3>())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2622 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2623 tuple.get<0>() = false;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2624 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2625 else if (type == ResourceType_Study)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2626 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2627 DicomMap tmp;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2628 transaction.GetMainDicomTags(tmp, id);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2629
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2630 switch (tuple.get<4>())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2631 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2632 case ResourceType_Patient:
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2633 tmp.ExtractPatientInformation(tuple.get<1>());
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2634 tuple.get<0>() = true;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2635 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2636
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2637 case ResourceType_Study:
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2638 tmp.ExtractStudyInformation(tuple.get<1>());
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2639 tuple.get<0>() = true;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2640 break;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2641
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2642 default:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2643 throw OrthancException(ErrorCode_InternalError);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2644 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2645 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2646 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2647 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2648 transaction.GetMainDicomTags(tuple.get<1>(), id);
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2649 tuple.get<0>() = true;
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2650 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2651 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2652 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2653
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2654 result.Clear();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2655
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2656 bool found;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2657 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2658 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
4562
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4561
diff changeset
2659 return found;
4560
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4559
diff changeset
2660 }
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2661
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2662
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2663 bool ServerIndex::GetAllMainDicomTags(DicomMap& result,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2664 const std::string& instancePublicId)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2665 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2666 class Operations : public ReadOnlyOperationsT3<bool&, DicomMap&, const std::string&>
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2667 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2668 public:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2669 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2670 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2671 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2672 // Lookup for the requested resource
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2673 int64_t instance;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2674 ResourceType type;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2675 if (!transaction.LookupResource(instance, type, tuple.get<2>()) ||
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2676 type != ResourceType_Instance)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2677 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2678 tuple.get<0>() = false;
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2679 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2680 else
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2681 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2682 DicomMap tmp;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2683
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2684 transaction.GetMainDicomTags(tmp, instance);
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2685 tuple.get<1>().Merge(tmp);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2686
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2687 int64_t series;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2688 if (!transaction.LookupParent(series, instance))
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2689 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2690 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2691 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2692
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2693 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2694 transaction.GetMainDicomTags(tmp, series);
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2695 tuple.get<1>().Merge(tmp);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2696
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2697 int64_t study;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2698 if (!transaction.LookupParent(study, series))
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2699 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2700 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2701 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2702
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2703 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2704 transaction.GetMainDicomTags(tmp, study);
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2705 tuple.get<1>().Merge(tmp);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2706
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2707 #ifndef NDEBUG
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2708 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2709 // Sanity test to check that all the main DICOM tags from the
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2710 // patient level are copied at the study level
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2711
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2712 int64_t patient;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2713 if (!transaction.LookupParent(patient, study))
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2714 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2715 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2716 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2717
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2718 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2719 transaction.GetMainDicomTags(tmp, study);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2720
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2721 std::set<DicomTag> patientTags;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2722 tmp.GetTags(patientTags);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2723
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2724 for (std::set<DicomTag>::const_iterator
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2725 it = patientTags.begin(); it != patientTags.end(); ++it)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2726 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2727 assert(tuple.get<1>().HasTag(*it));
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2728 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2729 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2730 #endif
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2731
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2732 tuple.get<0>() = true;
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2733 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2734 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2735 };
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2736
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2737 result.Clear();
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2738
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2739 bool found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2740 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2741 operations.Apply(*this, found, result, instancePublicId);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2742 return found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2743 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2744
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2745
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2746 bool ServerIndex::LookupResourceType(ResourceType& type,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2747 const std::string& publicId)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2748 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2749 class Operations : public ReadOnlyOperationsT3<bool&, ResourceType&, const std::string&>
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2750 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2751 public:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2752 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2753 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2754 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2755 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2756 int64_t id;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2757 tuple.get<0>() = transaction.LookupResource(id, tuple.get<1>(), tuple.get<2>());
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2758 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2759 };
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2760
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2761 bool found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2762 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2763 operations.Apply(*this, found, type, publicId);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2764 return found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2765 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2766
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2767
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2768 unsigned int ServerIndex::GetDatabaseVersion()
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2769 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2770 class Operations : public ReadOnlyOperationsT1<unsigned int&>
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2771 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2772 public:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2773 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2774 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2775 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2776 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2777 tuple.get<0>() = transaction.GetDatabaseVersion();
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2778 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2779 };
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2780
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2781 unsigned int version;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2782 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2783 operations.Apply(*this, version);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2784 return version;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2785 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2786
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2787
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2788 bool ServerIndex::LookupParent(std::string& target,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2789 const std::string& publicId,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2790 ResourceType parentType)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2791 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2792 class Operations : public ReadOnlyOperationsT4<bool&, std::string&, const std::string&, ResourceType>
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2793 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2794 public:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2795 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2796 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2797 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2798 ResourceType type;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2799 int64_t id;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2800 if (!transaction.LookupResource(id, type, tuple.get<2>()))
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2801 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2802 throw OrthancException(ErrorCode_UnknownResource);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2803 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2804
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2805 while (type != tuple.get<3>())
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2806 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2807 int64_t parentId;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2808
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2809 if (type == ResourceType_Patient || // Cannot further go up in hierarchy
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2810 !transaction.LookupParent(parentId, id))
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2811 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2812 tuple.get<0>() = false;
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2813 return;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2814 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2815
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2816 id = parentId;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2817 type = GetParentResourceType(type);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2818 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2819
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2820 tuple.get<0>() = true;
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2821 tuple.get<1>() = transaction.GetPublicId(id);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2822 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2823 };
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2824
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2825 bool found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2826 Operations operations;
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2827 operations.Apply(*this, found, target, publicId, parentType);
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2828 return found;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2829 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2830
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2831
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2832 void ServerIndex::ApplyLookupResources(std::vector<std::string>& resourcesId,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2833 std::vector<std::string>* instancesId,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2834 const DatabaseLookup& lookup,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2835 ResourceType queryLevel,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2836 size_t limit)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2837 {
4564
5a0adc1c19a9 avoid copy of objects in ServerIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4563
diff changeset
2838 class Operations : public ReadOnlyOperationsT4<bool, const std::vector<DatabaseConstraint>&, ResourceType, size_t>
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2839 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2840 private:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2841 std::list<std::string> resourcesList_;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2842 std::list<std::string> instancesList_;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2843
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2844 public:
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2845 const std::list<std::string>& GetResourcesList() const
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2846 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2847 return resourcesList_;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2848 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2849
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2850 const std::list<std::string>& GetInstancesList() const
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2851 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2852 return instancesList_;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2853 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2854
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2855 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2856 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2857 {
4570
648defffc8cc new enum: TransactionType
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4569
diff changeset
2858 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4563
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2859 if (tuple.get<0>())
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2860 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2861 transaction.ApplyLookupResources(resourcesList_, &instancesList_, tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2862 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2863 else
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2864 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2865 transaction.ApplyLookupResources(resourcesList_, NULL, tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2866 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2867 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2868 };
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2869
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2870
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2871 std::vector<DatabaseConstraint> normalized;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2872 NormalizeLookup(normalized, lookup, queryLevel);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2873
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2874 Operations operations;
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2875 operations.Apply(*this, (instancesId != NULL), normalized, queryLevel, limit);
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2876
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2877 CopyListToVector(resourcesId, operations.GetResourcesList());
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2878
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2879 if (instancesId != NULL)
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2880 {
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2881 CopyListToVector(*instancesId, operations.GetInstancesList());
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2882 }
bb1c365f9e44 end of refactoring read-only transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4562
diff changeset
2883 }
4565
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2884
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2885
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2886 bool ServerIndex::DeleteResource(Json::Value& target,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2887 const std::string& uuid,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2888 ResourceType expectedType)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2889 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2890 class Operations : public IReadWriteOperations
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2891 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2892 private:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2893 bool found_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2894 Json::Value& target_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2895 const std::string& uuid_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2896 ResourceType expectedType_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2897
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2898 public:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2899 Operations(Json::Value& target,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2900 const std::string& uuid,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2901 ResourceType expectedType) :
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2902 found_(false),
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2903 target_(target),
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2904 uuid_(uuid),
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2905 expectedType_(expectedType)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2906 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2907 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2908
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2909 bool IsFound() const
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2910 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2911 return found_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2912 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2913
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
2914 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4565
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2915 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2916 int64_t id;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2917 ResourceType type;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2918 if (!transaction.LookupResource(id, type, uuid_) ||
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2919 expectedType_ != type)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2920 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2921 found_ = false;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2922 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2923 else
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2924 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2925 found_ = true;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2926 transaction.DeleteResource(id);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2927
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
2928 if (transaction.GetListener().HasRemainingLevel())
4565
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2929 {
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
2930 ResourceType remainingType = transaction.GetListener().GetRemainingType();
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
2931 const std::string& remainingUuid = transaction.GetListener().GetRemainingPublicId();
4565
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2932
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2933 target_["RemainingAncestor"] = Json::Value(Json::objectValue);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2934 target_["RemainingAncestor"]["Path"] = GetBasePath(remainingType, remainingUuid);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2935 target_["RemainingAncestor"]["Type"] = EnumerationToString(remainingType);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2936 target_["RemainingAncestor"]["ID"] = remainingUuid;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2937 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2938 else
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2939 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2940 target_["RemainingAncestor"] = Json::nullValue;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2941 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2942 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2943 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2944 };
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2945
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2946 Operations operations(target, uuid, expectedType);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2947 Apply(operations);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2948 return operations.IsFound();
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2949 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2950
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2951
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2952 void ServerIndex::LogExportedResource(const std::string& publicId,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2953 const std::string& remoteModality)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2954 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2955 class Operations : public IReadWriteOperations
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2956 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2957 private:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2958 const std::string& publicId_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2959 const std::string& remoteModality_;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2960
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2961 public:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2962 Operations(const std::string& publicId,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2963 const std::string& remoteModality) :
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2964 publicId_(publicId),
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2965 remoteModality_(remoteModality)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2966 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2967 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2968
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
2969 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4565
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2970 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2971 int64_t id;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2972 ResourceType type;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2973 if (!transaction.LookupResource(id, type, publicId_))
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2974 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2975 throw OrthancException(ErrorCode_InexistentItem);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2976 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2977
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2978 std::string patientId;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2979 std::string studyInstanceUid;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2980 std::string seriesInstanceUid;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2981 std::string sopInstanceUid;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2982
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2983 int64_t currentId = id;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2984 ResourceType currentType = type;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2985
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2986 // Iteratively go up inside the patient/study/series/instance hierarchy
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2987 bool done = false;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2988 while (!done)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2989 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2990 DicomMap map;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2991 transaction.GetMainDicomTags(map, currentId);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2992
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2993 switch (currentType)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2994 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2995 case ResourceType_Patient:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2996 if (map.HasTag(DICOM_TAG_PATIENT_ID))
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2997 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2998 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
2999 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3000 done = true;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3001 break;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3002
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3003 case ResourceType_Study:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3004 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3005 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3006 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3007 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3008 currentType = ResourceType_Patient;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3009 break;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3010
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3011 case ResourceType_Series:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3012 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3013 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3014 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3015 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3016 currentType = ResourceType_Study;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3017 break;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3018
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3019 case ResourceType_Instance:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3020 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3021 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3022 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3023 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3024 currentType = ResourceType_Series;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3025 break;
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3026
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3027 default:
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3028 throw OrthancException(ErrorCode_InternalError);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3029 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3030
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3031 // If we have not reached the Patient level, find the parent of
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3032 // the current resource
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3033 if (!done)
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3034 {
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3035 bool ok = transaction.LookupParent(currentId, currentId);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3036 (void) ok; // Remove warning about unused variable in release builds
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3037 assert(ok);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3038 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3039 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3040
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3041 ExportedResource resource(-1,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3042 type,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3043 publicId_,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3044 remoteModality_,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3045 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3046 patientId,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3047 studyInstanceUid,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3048 seriesInstanceUid,
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3049 sopInstanceUid);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3050
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3051 transaction.LogExportedResource(resource);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3052 }
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3053 };
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3054
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3055 Operations operations(publicId, remoteModality);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3056 Apply(operations);
3495a3d97ab6 start of read-write transactions
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4564
diff changeset
3057 }
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3058
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3059
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3060 void ServerIndex::SetProtectedPatient(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3061 bool isProtected)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3062 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3063 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3064 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3065 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3066 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3067 bool isProtected_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3068
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3069 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3070 Operations(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3071 bool isProtected) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3072 publicId_(publicId),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3073 isProtected_(isProtected)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3074 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3075 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3076
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3077 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3078 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3079 // Lookup for the requested resource
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3080 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3081 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3082 if (!transaction.LookupResource(id, type, publicId_) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3083 type != ResourceType_Patient)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3084 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3085 throw OrthancException(ErrorCode_ParameterOutOfRange);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3086 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3087 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3088 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3089 transaction.SetProtectedPatient(id, isProtected_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3090 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3091 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3092 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3093
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3094 Operations operations(publicId, isProtected);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3095 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3096
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3097 if (isProtected)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3098 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3099 LOG(INFO) << "Patient " << publicId << " has been protected";
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3100 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3101 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3102 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3103 LOG(INFO) << "Patient " << publicId << " has been unprotected";
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3104 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3105 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3106
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3107
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3108 void ServerIndex::SetMetadata(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3109 MetadataType type,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3110 const std::string& value)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3111 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3112 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3113 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3114 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3115 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3116 MetadataType type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3117 const std::string& value_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3118
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3119 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3120 Operations(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3121 MetadataType type,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3122 const std::string& value) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3123 publicId_(publicId),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3124 type_(type),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3125 value_(value)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3126 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3127 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3128
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3129 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3130 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3131 ResourceType rtype;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3132 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3133 if (!transaction.LookupResource(id, rtype, publicId_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3134 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3135 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3136 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3137 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3138 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3139 transaction.SetMetadata(id, type_, value_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3140
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3141 if (IsUserMetadata(type_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3142 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3143 transaction.LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3144 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3145 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3146 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3147 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3148
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3149 Operations operations(publicId, type, value);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3150 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3151 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3152
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3153
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3154 void ServerIndex::DeleteMetadata(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3155 MetadataType type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3156 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3157 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3158 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3159 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3160 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3161 MetadataType type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3162
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3163 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3164 Operations(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3165 MetadataType type) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3166 publicId_(publicId),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3167 type_(type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3168 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3169 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3170
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3171 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3172 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3173 ResourceType rtype;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3174 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3175 if (!transaction.LookupResource(id, rtype, publicId_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3176 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3177 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3178 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3179 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3180 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3181 transaction.DeleteMetadata(id, type_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3182
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3183 if (IsUserMetadata(type_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3184 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3185 transaction.LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3186 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3187 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3188 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3189 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3190
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3191 Operations operations(publicId, type);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3192 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3193 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3194
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3195
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3196 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3197 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3198 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3199 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3200 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3201 uint64_t newValue_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3202 GlobalProperty sequence_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3203
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3204 public:
4569
19ea4ecd6d9a cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4568
diff changeset
3205 explicit Operations(GlobalProperty sequence) :
19ea4ecd6d9a cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4568
diff changeset
3206 newValue_(0), // Dummy initialization
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3207 sequence_(sequence)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3208 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3209 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3210
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3211 uint64_t GetNewValue() const
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3212 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3213 return newValue_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3214 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3215
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3216 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3217 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3218 std::string oldString;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3219
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3220 if (transaction.LookupGlobalProperty(oldString, sequence_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3221 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3222 uint64_t oldValue;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3223
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3224 try
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3225 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3226 oldValue = boost::lexical_cast<uint64_t>(oldString);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3227 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3228 catch (boost::bad_lexical_cast&)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3229 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3230 LOG(ERROR) << "Cannot read the global sequence "
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3231 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3232 oldValue = 0;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3233 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3234
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3235 newValue_ = oldValue + 1;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3236 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3237 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3238 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3239 // Initialize the sequence at "1"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3240 newValue_ = 1;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3241 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3242
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3243 transaction.SetGlobalProperty(sequence_, boost::lexical_cast<std::string>(newValue_));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3244 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3245 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3246
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3247 Operations operations(sequence);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3248 Apply(operations);
4569
19ea4ecd6d9a cppcheck
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4568
diff changeset
3249 assert(operations.GetNewValue() != 0);
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3250 return operations.GetNewValue();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3251 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3252
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3253
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3254 void ServerIndex::DeleteChanges()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3255 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3256 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3257 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3258 public:
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3259 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3260 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3261 transaction.ClearChanges();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3262 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3263 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3264
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3265 Operations operations;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3266 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3267 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3268
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3269
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3270 void ServerIndex::DeleteExportedResources()
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3271 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3272 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3273 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3274 public:
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3275 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3276 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3277 transaction.ClearExportedResources();
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3278 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3279 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3280
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3281 Operations operations;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3282 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3283 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3284
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3285
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3286 void ServerIndex::SetGlobalProperty(GlobalProperty property,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3287 const std::string& value)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3288 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3289 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3290 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3291 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3292 GlobalProperty property_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3293 const std::string& value_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3294
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3295 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3296 Operations(GlobalProperty property,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3297 const std::string& value) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3298 property_(property),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3299 value_(value)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3300 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3301 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3302
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3303 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3304 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3305 transaction.SetGlobalProperty(property_, value_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3306 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3307 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3308
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3309 Operations operations(property, value);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3310 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4566
diff changeset
3311 }
4568
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3312
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3313
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3314 void ServerIndex::DeleteAttachment(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3315 FileContentType type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3316 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3317 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3318 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3319 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3320 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3321 FileContentType type_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3322
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3323 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3324 Operations(const std::string& publicId,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3325 FileContentType type) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3326 publicId_(publicId),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3327 type_(type)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3328 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3329 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3330
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3331 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4568
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3332 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3333 ResourceType rtype;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3334 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3335 if (!transaction.LookupResource(id, rtype, publicId_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3336 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3337 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3338 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3339 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3340 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3341 transaction.DeleteAttachment(id, type_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3342
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3343 if (IsUserContentType(type_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3344 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3345 transaction.LogChange(id, ChangeType_UpdatedAttachment, rtype, publicId_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3346 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3347 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3348 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3349 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3350
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3351 Operations operations(publicId, type);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3352 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3353 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3354
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3355
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3356 void ServerIndex::LogChange(ChangeType changeType,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3357 const std::string& publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3358 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3359 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3360 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3361 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3362 ChangeType changeType_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3363 const std::string& publicId_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3364
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3365 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3366 Operations(ChangeType changeType,
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3367 const std::string& publicId) :
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3368 changeType_(changeType),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3369 publicId_(publicId)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3370 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3371 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3372
4573
f6bd5563b5df simplification
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4572
diff changeset
3373 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4568
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3374 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3375 int64_t id;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3376 ResourceType type;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3377 if (!transaction.LookupResource(id, type, publicId_))
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3378 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3379 throw OrthancException(ErrorCode_UnknownResource);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3380 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3381 else
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3382 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3383 transaction.LogChange(id, changeType_, type, publicId_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3384 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3385 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3386 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3387
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3388 Operations operations(changeType, publicId);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3389 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4567
diff changeset
3390 }
4574
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3391
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3392
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3393 void ServerIndex::ReconstructInstance(const ParsedDicomFile& dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3394 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3395 class Operations : public IReadWriteOperations
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3396 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3397 private:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3398 DicomMap summary_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3399 std::unique_ptr<DicomInstanceHasher> hasher_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3400 bool hasTransferSyntax_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3401 DicomTransferSyntax transferSyntax_;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3402
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3403 public:
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3404 Operations(const ParsedDicomFile& dicom)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3405 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3406 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3407 hasher_.reset(new DicomInstanceHasher(summary_));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3408 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3409 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3410
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3411 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3412 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3413 int64_t patient = -1, study = -1, series = -1, instance = -1;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3414
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3415 ResourceType type1, type2, type3, type4;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3416 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3417 !transaction.LookupResource(study, type2, hasher_->HashStudy()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3418 !transaction.LookupResource(series, type3, hasher_->HashSeries()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3419 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3420 type1 != ResourceType_Patient ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3421 type2 != ResourceType_Study ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3422 type3 != ResourceType_Series ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3423 type4 != ResourceType_Instance ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3424 patient == -1 ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3425 study == -1 ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3426 series == -1 ||
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3427 instance == -1)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3428 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3429 throw OrthancException(ErrorCode_InternalError);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3430 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3431
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3432 transaction.ClearMainDicomTags(patient);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3433 transaction.ClearMainDicomTags(study);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3434 transaction.ClearMainDicomTags(series);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3435 transaction.ClearMainDicomTags(instance);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3436
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3437 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3438 ResourcesContent content;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3439 content.AddResource(patient, ResourceType_Patient, summary_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3440 content.AddResource(study, ResourceType_Study, summary_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3441 content.AddResource(series, ResourceType_Series, summary_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3442 content.AddResource(instance, ResourceType_Instance, summary_);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3443 transaction.SetResourcesContent(content);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3444 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3445
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3446 if (hasTransferSyntax_)
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3447 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3448 transaction.SetMetadata(instance, MetadataType_Instance_TransferSyntax, GetTransferSyntaxUid(transferSyntax_));
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3449 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3450
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3451 const DicomValue* value;
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3452 if ((value = summary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3453 !value->IsNull() &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3454 !value->IsBinary())
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3455 {
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3456 transaction.SetMetadata(instance, MetadataType_Instance_SopClassUid, value->GetContent());
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3457 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3458 }
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3459 };
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3460
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3461 Operations operations(dicom);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3462 Apply(operations);
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 4573
diff changeset
3463 }
0
3959d33612cc initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3464 }