orthanc: OrthancServer/Sources/ServerIndex.cpp annotate

annotate OrthancServer/Sources/ServerIndex.cpp @ 4570:648defffc8cc db-changes

new enum: TransactionType

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 08 Mar 2021 16:04:56 +0100
parents	19ea4ecd6d9a
children	9224e107d613

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

Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerIndex.cpp @ 4570:648defffc8cc db-changes