Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerIndex.cpp @ 4586:1d96fe7e054e db-changes

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