Mercurial > hg > orthanc

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