orthanc: OrthancServer/Sources/ServerIndex.cpp annotate

annotate OrthancServer/Sources/ServerIndex.cpp @ 4575:e23bacd4fffc db-changes

clarifications in ServerIndex::Recycle()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 08 Mar 2021 18:30:06 +0100
parents	855e43bb293c
children	f6cd49af7526

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,
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	180 const std::string& publicId) ORTHANC_OVERRIDE
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	181 {
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4263 diff changeset	182 LOG(TRACE) << "Remaining ancestor \"" << publicId << "\" (" << parentType << ")";
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	183
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	184 if (hasRemainingLevel_)
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	185 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	186 if (parentType < remainingType_)
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	187 {
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	188 remainingType_ = parentType;
bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	189 remainingPublicId_ = publicId;
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	190 }
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1148 diff changeset	191 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	192 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	193 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	194 hasRemainingLevel_ = true;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	195 remainingType_ = parentType;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	196 remainingPublicId_ = publicId;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	197 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	198 }
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	199
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	200 virtual void SignalAttachmentDeleted(const FileInfo& info) ORTHANC_OVERRIDE
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	201 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	202 assert(Toolbox::IsUuid(info.GetUuid()));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	203 pendingFilesToRemove_.push_back(FileToRemove(info));
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	204 sizeOfFilesToRemove_ += info.GetCompressedSize();
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	205 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	206
4571 9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	207 virtual void SignalResourceDeleted(ResourceType type,
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	208 const std::string& publicId) ORTHANC_OVERRIDE
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	209 {
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	210 SignalChange(ServerIndexChange(ChangeType_Deleted, type, publicId));
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	211 }
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	212
9224e107d613 simplifying IDatabaseListener::SignalChange() as IDatabaseListener::SignalResourceDeleted() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4570 diff changeset	213 void SignalChange(const ServerIndexChange& change)
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	214 {
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4263 diff changeset	215 LOG(TRACE) << "Change related to resource " << change.GetPublicId() << " of type "
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4263 diff changeset	216 << EnumerationToString(change.GetResourceType()) << ": "
0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4263 diff changeset	217 << EnumerationToString(change.GetChangeType());
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	218
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	219 if (insideTransaction_)
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	220 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	221 pendingChanges_.push_back(change);
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	222 }
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	223 else
201 bee20e978835 refactoring of delete Sebastien Jodogne <s.jodogne@gmail.com> parents: 200 diff changeset	224 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	225 context_.SignalChange(change);
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	226 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	227 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	228
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	229 bool HasRemainingLevel() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	230 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	231 return hasRemainingLevel_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	232 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	233
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	234 ResourceType GetRemainingType() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	235 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	236 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	237 return remainingType_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	238 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	239
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	240 const std::string& GetRemainingPublicId() const
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	241 {
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	242 assert(HasRemainingLevel());
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	243 return remainingPublicId_;
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	244 }
0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	245 };
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	248 class ServerIndex::Transaction
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	249 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	250 private:
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	251 ServerIndex& index_;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3702 diff changeset	252 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	253 bool isCommitted_;
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	254
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	255 public:
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	256 explicit Transaction(ServerIndex& index,
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	257 TransactionType type) :
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	258 index_(index),
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	259 isCommitted_(false)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	260 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	261 transaction_.reset(index_.db_.StartTransaction(type));
1191 d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	262 index_.listener_->StartTransaction();
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	263 }
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	264
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	265 ~Transaction()
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	266 {
d49505e377e3 demo of OnChangeCallback in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1189 diff changeset	267 index_.listener_->EndTransaction();
1310 61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	268
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	269 if (!isCommitted_)
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	270 {
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	271 transaction_->Rollback();
61ce8147f30d custom database back-end Sebastien Jodogne <s.jodogne@gmail.com> parents: 1306 diff changeset	272 }
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	273 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	274
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	275 void Commit(uint64_t sizeOfAddedFiles)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	276 {
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	277 if (!isCommitted_)
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	278 {
3019 8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	279 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	280 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	281
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3006 diff changeset	282 transaction_->Commit(delta);
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	283
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	284 // 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	285 // 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	286 // deleted because of recycling.
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	287 index_.listener_->CommitFilesToRemove();
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	288
1189 6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	289 // Send all the pending changes to the Orthanc plugins
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	290 index_.listener_->CommitChanges();
6b9b02a16e99 NewChildInstance change type Sebastien Jodogne <s.jodogne@gmail.com> parents: 1177 diff changeset	291
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	292 isCommitted_ = true;
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	293 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	294 }
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	295 };
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	296
771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	297
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	298 class ServerIndex::UnstableResourcePayload
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	299 {
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	300 private:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	301 ResourceType type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	302 std::string publicId_;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	303 boost::posix_time::ptime time_;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	304
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	305 public:
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	306 UnstableResourcePayload() : type_(ResourceType_Instance)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	307 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	308 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	309
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	310 UnstableResourcePayload(Orthanc::ResourceType type,
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	311 const std::string& publicId) :
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	312 type_(type),
4205 d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	313 publicId_(publicId),
d962a2996637 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4140 diff changeset	314 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	315 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	316 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	317
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	318 unsigned int GetAge() const
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	319 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	320 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	321 }
1177 5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	322
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	323 ResourceType GetResourceType() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	324 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	325 return type_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	326 }
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	327
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	328 const std::string& GetPublicId() const
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	329 {
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	330 return publicId_;
5b2d8c280ac2 Plugins can monitor changes through callbacks Sebastien Jodogne <s.jodogne@gmail.com> parents: 1162 diff changeset	331 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	332 };
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	333
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	334
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	335 class ServerIndex::MainDicomTagsRegistry : public boost::noncopyable
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	336 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	337 private:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	338 class TagInfo
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	339 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	340 private:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	341 ResourceType level_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	342 DicomTagType type_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	343
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	344 public:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	345 TagInfo()
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	346 {
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 TagInfo(ResourceType level,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	350 DicomTagType type) :
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	351 level_(level),
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	352 type_(type)
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
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	356 ResourceType GetLevel() const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	357 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	358 return level_;
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 DicomTagType GetType() const
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 return type_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	364 }
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
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	367 typedef std::map<DicomTag, TagInfo> Registry;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	368
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	369
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	370 Registry registry_;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	371
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	372 void LoadTags(ResourceType level)
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 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	375 const DicomTag* tags = NULL;
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	376 size_t size;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	377
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	378 ServerToolbox::LoadIdentifiers(tags, size, level);
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	379
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	380 for (size_t i = 0; i < size; i++)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	381 {
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	382 if (registry_.find(tags[i]) == registry_.end())
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	383 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	384 registry_[tags[i]] = TagInfo(level, DicomTagType_Identifier);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	385 }
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	386 else
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	387 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	388 // These patient-level tags are copied in the study level
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	389 assert(level == ResourceType_Study &&
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	390 (tags[i] == DICOM_TAG_PATIENT_ID \|\|
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	391 tags[i] == DICOM_TAG_PATIENT_NAME \|\|
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	392 tags[i] == DICOM_TAG_PATIENT_BIRTH_DATE));
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	393 }
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	394 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	395 }
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	396
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 std::set<DicomTag> tags;
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	399 DicomMap::GetMainDicomTags(tags, level);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	400
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	401 for (std::set<DicomTag>::const_iterator
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	402 tag = tags.begin(); tag != tags.end(); ++tag)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	403 {
3650 e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	404 if (registry_.find(*tag) == registry_.end())
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	405 {
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	406 registry_[*tag] = TagInfo(level, DicomTagType_Main);
e5811a9f8df0 removing DicomMap::LoadMainDicomTags() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	407 }
3027 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 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	410 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	411
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	412 public:
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	413 MainDicomTagsRegistry()
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 LoadTags(ResourceType_Patient);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	416 LoadTags(ResourceType_Study);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	417 LoadTags(ResourceType_Series);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	418 LoadTags(ResourceType_Instance);
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	419 }
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 void LookupTag(ResourceType& level,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	422 DicomTagType& type,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	423 const DicomTag& tag) const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	424 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	425 Registry::const_iterator it = registry_.find(tag);
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 if (it == registry_.end())
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 // Default values
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	430 level = ResourceType_Instance;
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	431 type = DicomTagType_Generic;
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 else
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 level = it->second.GetLevel();
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	436 type = it->second.GetType();
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	437 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	438 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	439 };
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	440
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	441
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	442 void ServerIndex::FlushThread(ServerIndex* that,
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	443 unsigned int threadSleep)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	444 {
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	445 // 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	446 unsigned int sleep = 10;
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	447
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	448 try
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	449 {
744 ec69658b031b fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 739 diff changeset	450 boost::mutex::scoped_lock lock(that->mutex_);
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	451 std::string sleepString;
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	452
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	453 if (that->db_.LookupGlobalProperty(sleepString, GlobalProperty_FlushSleep) &&
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	454 Toolbox::IsInteger(sleepString))
1102 ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	455 {
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	456 sleep = boost::lexical_cast<unsigned int>(sleepString);
ce6386b37afd avoid unnecessary exceptions on Orthanc startup Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	457 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	458 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	459 catch (boost::bad_lexical_cast&)
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 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	462
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	463 LOG(INFO) << "Starting the database flushing thread (sleep = " << sleep << ")";
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	464
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	465 unsigned int count = 0;
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 while (!that->done_)
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	468 {
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	469 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	470 count++;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	471 if (count < sleep)
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	472 {
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	473 continue;
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	474 }
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	475
2217 4f39ab2cb453 flush Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	476 Logging::Flush();
4f39ab2cb453 flush Sebastien Jodogne <s.jodogne@gmail.com> parents: 2209 diff changeset	477
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	478 boost::mutex::scoped_lock lock(that->mutex_);
3698 356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	479
356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	480 try
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 that->db_.FlushToDisk();
356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	483 }
356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	484 catch (OrthancException&)
356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	485 {
3699 efa815dd2c20 additional logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3698 diff changeset	486 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	487 }
356ebef2cd95 prevent crash on full disk Sebastien Jodogne <s.jodogne@gmail.com> parents: 3650 diff changeset	488
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	489 count = 0;
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	490 }
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	491
3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	492 LOG(INFO) << "Stopping the database flushing thread";
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	493 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	494
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	495
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	496 static bool ComputeExpectedNumberOfInstances(int64_t& target,
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	497 const DicomMap& dicomSummary)
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	498 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	499 try
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	500 {
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	501 const DicomValue* value;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	502 const DicomValue* value2;
08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	503
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	504 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	505 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	506 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	507 (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	508 !value2->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	509 !value2->IsBinary())
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 // 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	512 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	513 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	514 target = imagesInAcquisition * countTemporalPositions;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	515 return (target > 0);
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	516 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	517
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	518 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	519 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	520 !value->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	521 (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	522 !value2->IsBinary() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	523 !value2->IsNull())
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 // Support of Cardio-PET images
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	526 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	527 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	528 target = numberOfSlices * numberOfTimeSlices;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	529 return (target > 0);
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	530 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	531
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	532 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	533 !value->IsNull() &&
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	534 !value->IsBinary())
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	535 {
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	536 target = boost::lexical_cast<int64_t>(value->GetContent());
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	537 return (target > 0);
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 }
1737 ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	540 catch (OrthancException&)
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	541 {
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	542 }
ec66a16aa398 removal of DicomStringValue and DicomNullValue Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	543 catch (boost::bad_lexical_cast&)
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	544 {
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	545 }
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	546
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	547 return false;
433 aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	548 }
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	549
aa50783f9550 cardiopet Sebastien Jodogne <s.jodogne@gmail.com> parents: 432 diff changeset	550
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	551
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	552
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	553 static bool LookupStringMetadata(std::string& result,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	554 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	555 MetadataType type)
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 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	558
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	559 if (found == metadata.end())
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	560 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	561 return false;
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 else
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 result = found->second;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	566 return true;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	567 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	568 }
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	569
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	570
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	571 static bool LookupIntegerMetadata(int64_t& result,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	572 const std::map<MetadataType, std::string>& metadata,
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	573 MetadataType type)
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	574 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	575 std::string s;
3187 4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	576 if (!LookupStringMetadata(s, metadata, type))
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	577 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	578 return false;
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
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	581 try
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	582 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	583 result = boost::lexical_cast<int64_t>(s);
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	584 return true;
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 catch (boost::bad_lexical_cast&)
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	587 {
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	588 return false;
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	589 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	590 }
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	591
0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	592
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	593 void ServerIndex::LogChange(int64_t internalId,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	594 ChangeType changeType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	595 ResourceType resourceType,
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	596 const std::string& publicId)
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	597 {
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	598 ServerIndexChange change(changeType, resourceType, publicId);
1300 919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	599
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	600 if (changeType <= ChangeType_INTERNAL_LastLogged)
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	601 {
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	602 db_.LogChange(internalId, change);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	603 }
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	604
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	605 assert(listener_.get() != NULL);
919dfb2fb3fe DANGEROUS refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1299 diff changeset	606 listener_->SignalChange(change);
1297 501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	607 }
501432928727 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1294 diff changeset	608
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	609
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	610 bool ServerIndex::IsUnstableResource(int64_t id)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	611 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	612 return unstableResources_.Contains(id);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	613 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	614
1237 0f3716b88af7 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1236 diff changeset	615
226 8a26a8e85edf refactoring to read files Sebastien Jodogne <s.jodogne@gmail.com> parents: 224 diff changeset	616 ServerIndex::ServerIndex(ServerContext& context,
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	617 IDatabaseWrapper& db,
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	618 unsigned int threadSleep) :
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	619 done_(false),
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	620 db_(db),
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	621 maximumStorageSize_(0),
2826 c277e0421200 unit testing of overwriting Sebastien Jodogne <s.jodogne@gmail.com> parents: 2825 diff changeset	622 maximumPatients_(0),
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	623 mainDicomTagsRegistry_(new MainDicomTagsRegistry),
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	624 maxRetries_(10)
186 f68c039b0571 preparing refactoring of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 180 diff changeset	625 {
1432 0ac74fa21db8 rename IServerIndexListener as IDatabaseListener Sebastien Jodogne <s.jodogne@gmail.com> parents: 1368 diff changeset	626 listener_.reset(new Listener(context));
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	627 db_.SetListener(*listener_);
180 626777d01dc4 use of hashes to index dicom objects Sebastien Jodogne <s.jodogne@gmail.com> parents: 179 diff changeset	628
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	629 // 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	630 // execution of Orthanc
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	631 StandaloneRecycling();
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	632
1306 8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	633 if (db.HasFlushToDisk())
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	634 {
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	635 flushThread_ = boost::thread(FlushThread, this, threadSleep);
1306 8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	636 }
8cd5784a6d80 IDatabaseWrapper::HasFlushToDisk() Sebastien Jodogne <s.jodogne@gmail.com> parents: 1305 diff changeset	637
2665 389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	638 unstableResourcesMonitorThread_ = boost::thread
389d050a2e66 fix deadlock, speed up unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 2664 diff changeset	639 (UnstableResourcesMonitorThread, this, threadSleep);
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	640 }
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	641
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	642
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	643
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	644 ServerIndex::~ServerIndex()
4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	645 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	646 if (!done_)
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	647 {
1453 c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	648 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	649 Stop();
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	650 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653
1453 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 void ServerIndex::Stop()
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	656 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	657 if (!done_)
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	658 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	659 done_ = true;
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 (db_.HasFlushToDisk() &&
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	662 flushThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	663 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	664 flushThread_.join();
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 if (unstableResourcesMonitorThread_.joinable())
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	668 {
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	669 unstableResourcesMonitorThread_.join();
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	670 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	671 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	672 }
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	673
c0bdc47165ef code to warn about possible threading problems Sebastien Jodogne <s.jodogne@gmail.com> parents: 1432 diff changeset	674
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	675 static void SetInstanceMetadata(ResourcesContent& content,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	676 std::map<MetadataType, std::string>& instanceMetadata,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	677 int64_t instance,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	678 MetadataType metadata,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	679 const std::string& value)
2188 7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	680 {
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	681 content.AddMetadata(instance, metadata, value);
2188 7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	682 instanceMetadata[metadata] = value;
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	683 }
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	684
7cfc2e0383b3 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 2142 diff changeset	685
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	686 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	687 const DicomMap& dicomSummary,
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	688 const Attachments& attachments,
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	689 const MetadataMap& metadata,
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	690 const DicomInstanceOrigin& origin,
4499 6f99949b2878 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	691 bool overwrite,
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	692 bool hasTransferSyntax,
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4506 diff changeset	693 DicomTransferSyntax transferSyntax,
4499 6f99949b2878 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	694 bool hasPixelDataOffset,
6f99949b2878 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 4494 diff changeset	695 uint64_t pixelDataOffset)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 {
206 4453a010d0db flush to disk thread Sebastien Jodogne <s.jodogne@gmail.com> parents: 205 diff changeset	697 boost::mutex::scoped_lock lock(mutex_);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	699 int64_t expectedInstances;
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	700 const bool hasExpectedInstances =
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	701 ComputeExpectedNumberOfInstances(expectedInstances, dicomSummary);
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	702
1006 649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	703 instanceMetadata.clear();
649d47854314 proper handling of metadata in Store Sebastien Jodogne <s.jodogne@gmail.com> parents: 1004 diff changeset	704
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	705 DicomInstanceHasher hasher(dicomSummary);
4505 97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	706 const std::string hashPatient = hasher.HashPatient();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	707 const std::string hashStudy = hasher.HashStudy();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	708 const std::string hashSeries = hasher.HashSeries();
97d103b57cd1 removed cached dicom summary from DicomInstanceToStore Sebastien Jodogne <s.jodogne@gmail.com> parents: 4499 diff changeset	709 const std::string hashInstance = hasher.HashInstance();
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	710
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 try
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	713 Transaction t(*this, TransactionType_ReadWrite);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	715 IDatabaseWrapper::CreateInstanceResult status;
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	716 int64_t instanceId;
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	717
2825 8aa6aef11b70 New configuration option "OverwriteInstances" to choose how duplicate SOPInstanceUID are handled Sebastien Jodogne <s.jodogne@gmail.com> parents: 2726 diff changeset	718 // Check whether this instance is already stored
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	719 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	720 hashStudy, hashSeries, hashInstance))
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721 {
3082 847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	722 // The instance already exists
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	723
3813 aaaa442bfe39 moving SetOverwriteInstances from ServerIndex to ServerContext Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	724 if (overwrite)
3082 847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	725 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	726 // Overwrite the old instance
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	727 LOG(INFO) << "Overwriting instance: " << hashInstance;
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	728 db_.DeleteResource(instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	729
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	730 // 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	731 if (!db_.CreateInstance(status, instanceId, hashPatient,
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	732 hashStudy, hashSeries, hashInstance))
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	733 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	734 throw OrthancException(ErrorCode_InternalError);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	735 }
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	736 }
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	737 else
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	738 {
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	739 // 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	740 db_.GetAllMetadata(instanceMetadata, instanceId);
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	741 return StoreStatus_AlreadyStored;
847a0ed92654 new extension for database plugin SDK: createInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	742 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	743 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	744
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	745
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	746 // 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	747 // from instance to patient.
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	748
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	749 // 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	750 // 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	751 // 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	752 // 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	753 // positive impact looks marginal in practice.
4572 c12d4e5f469b removed redundant ServerIndex::SignalNewResource() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	754 LogChange(instanceId, ChangeType_NewInstance, ResourceType_Instance, hashInstance);
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	755
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	756 if (status.isNewSeries_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	757 {
4572 c12d4e5f469b removed redundant ServerIndex::SignalNewResource() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	758 LogChange(status.seriesId_, ChangeType_NewSeries, ResourceType_Series, hashSeries);
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	760
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	761 if (status.isNewStudy_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	762 {
4572 c12d4e5f469b removed redundant ServerIndex::SignalNewResource() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	763 LogChange(status.studyId_, ChangeType_NewStudy, ResourceType_Study, hashStudy);
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	764 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	765
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	766 if (status.isNewPatient_)
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	767 {
4572 c12d4e5f469b removed redundant ServerIndex::SignalNewResource() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	768 LogChange(status.patientId_, ChangeType_NewPatient, ResourceType_Patient, hashPatient);
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	769 }
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	770
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	771
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	772 // 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	773 uint64_t instanceSize = 0;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	774 for (Attachments::const_iterator it = attachments.begin();
656 08eca5d86aad fixes to cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 646 diff changeset	775 it != attachments.end(); ++it)
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	776 {
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	777 instanceSize += it->GetCompressedSize();
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	778 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	779
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	780 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	781
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	782
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	783 // Attach the files to the newly created instance
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	784 for (Attachments::const_iterator it = attachments.begin();
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	785 it != attachments.end(); ++it)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	786 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	787 db_.AddAttachment(instanceId, *it);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	788 }
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	789
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	790
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 {
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	792 ResourcesContent content;
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	793
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	794 // Populate the tags of the newly-created resources
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	795
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	796 content.AddResource(instanceId, ResourceType_Instance, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	797
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	798 if (status.isNewSeries_)
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	799 {
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	800 content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary);
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	801 }
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	802
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	803 if (status.isNewStudy_)
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 content.AddResource(status.studyId_, ResourceType_Study, dicomSummary);
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
683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	808 if (status.isNewPatient_)
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 content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary);
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
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	813
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	814 // Attach the user-specified metadata
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	815
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	816 for (MetadataMap::const_iterator
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	817 it = metadata.begin(); it != metadata.end(); ++it)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	818 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	819 switch (it->first.first)
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 case ResourceType_Patient:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	822 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	823 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	824
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	825 case ResourceType_Study:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	826 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	827 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	828
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	829 case ResourceType_Series:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	830 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	831 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	832
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	833 case ResourceType_Instance:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	834 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	835 it->first.second, it->second);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	836 break;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	837
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	838 default:
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	839 throw OrthancException(ErrorCode_ParameterOutOfRange);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	840 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	841 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	842
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	843
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	844 // 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	845 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	846 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	847 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	848 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	849
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	850 if (status.isNewSeries_)
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	851 {
4460 6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	852 if (hasExpectedInstances)
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	853 {
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	854 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	855 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	856 }
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	857
6831de40acd9 New metadata automatically computed at the series level: "RemoteAET" Sebastien Jodogne <s.jodogne@gmail.com> parents: 4437 diff changeset	858 // 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	859 content.AddMetadata(status.seriesId_, MetadataType_RemoteAet,
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	860 origin.GetRemoteAetC());
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	861 }
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	862
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	863
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	864 // 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	865 // reflecting these additions into the input metadata map
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	866 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	867 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	868 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_RemoteAet,
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	869 origin.GetRemoteAetC());
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	870 SetInstanceMetadata(content, instanceMetadata, instanceId, MetadataType_Instance_Origin,
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	871 EnumerationToString(origin.GetRequestOrigin()));
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	872
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	873
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	874 if (hasTransferSyntax)
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	875 {
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	876 // New in Orthanc 1.2.0
ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	877 SetInstanceMetadata(content, instanceMetadata, instanceId,
4507 b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4506 diff changeset	878 MetadataType_Instance_TransferSyntax,
b4c58795f3a8 widening the use of DicomTransferSyntax enum Sebastien Jodogne <s.jodogne@gmail.com> parents: 4506 diff changeset	879 GetTransferSyntaxUid(transferSyntax));
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	880 }
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	881
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	882 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	883 std::string s;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	884
4506 ac69c9f76c71 refactoring ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4505 diff changeset	885 if (origin.LookupRemoteIp(s))
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	886 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	887 // New in Orthanc 1.4.0
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	888 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	889 MetadataType_Instance_RemoteIp, s);
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	890 }
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.LookupCalledAet(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_CalledAet, 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.LookupHttpUsername(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_HttpUsername, 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 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	906
4514 5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	907 if (hasPixelDataOffset)
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	908 {
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	909 // New in Orthanc 1.9.1
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	910 SetInstanceMetadata(content, instanceMetadata, instanceId,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	911 MetadataType_Instance_PixelDataOffset,
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	912 boost::lexical_cast<std::string>(pixelDataOffset));
5b929e6b3c36 removal of "dicom-as-json" attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4507 diff changeset	913 }
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	914
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	915 const DicomValue* value;
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	916 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	917 !value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	918 !value->IsBinary())
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	919 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	920 SetInstanceMetadata(content, instanceMetadata, instanceId,
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	921 MetadataType_Instance_SopClassUid, value->GetContent());
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	922 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	923
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	924
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	925 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	926 (value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	927 {
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	928 if (!value->IsNull() &&
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	929 !value->IsBinary())
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 SetInstanceMetadata(content, instanceMetadata, instanceId,
4263 61a2bedbae80 sanitize IndexInSeries (we've seen spaces there !) Alain Mazy <alain@mazy.be> parents: 4205 diff changeset	932 MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	933 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	934 }
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	935
74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	936
3083 683d572424b6 IDatabaseWrapper::SetResourcesContent Sebastien Jodogne <s.jodogne@gmail.com> parents: 3082 diff changeset	937 db_.SetResourcesContent(content);
3080 1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	938 }
3086 74e3e48aa9bd grouping the setting of metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 3083 diff changeset	939
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	940
31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	941 // 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	942 int64_t expectedNumberOfInstances;
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	943 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary))
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	944 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	945 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	946 if (seriesStatus == SeriesStatus_Complete)
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	947 {
4bbadcd03966 refactoring retrieval of metadata from database Sebastien Jodogne <s.jodogne@gmail.com> parents: 3174 diff changeset	948 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	949 }
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	950 }
3087 df1b17be20f6 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3086 diff changeset	951
205 6ab754744446 logging of completed series Sebastien Jodogne <s.jodogne@gmail.com> parents: 204 diff changeset	952
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	953 // 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	954 MarkAsUnstable(status.seriesId_, ResourceType_Series, hashSeries);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	955 MarkAsUnstable(status.studyId_, ResourceType_Study, hashStudy);
1a75595d8e44 started refactoring of ServerIndex::Store() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3075 diff changeset	956 MarkAsUnstable(status.patientId_, ResourceType_Patient, hashPatient);
511 3b735fdf320b monitoring of stable patients/studies/series Sebastien Jodogne <s.jodogne@gmail.com> parents: 440 diff changeset	957
278 771f12042be9 more efficient determination of storage size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 273 diff changeset	958 t.Commit(instanceSize);
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	959
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 return StoreStatus_Success;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 }
62 a70bb32802ae renaming Server Sebastien Jodogne <s.jodogne@gmail.com> parents: 57 diff changeset	962 catch (OrthancException& e)
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	964 LOG(ERROR) << "EXCEPTION [" << e.What() << "]";
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	965 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967 return StoreStatus_Failure;
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 }
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969
3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	971 SeriesStatus ServerIndex::GetSeriesStatus(IDatabaseWrapper& db,
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	972 int64_t id,
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	973 int64_t expectedNumberOfInstances)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	974 {
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	975 std::list<std::string> values;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	976 db.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	977
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	978 std::set<int64_t> instances;
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	979
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	980 for (std::list<std::string>::const_iterator
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	981 it = values.begin(); it != values.end(); ++it)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	982 {
1238 6c07108ff1e2 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1237 diff changeset	983 int64_t index;
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	984
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	985 try
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 index = boost::lexical_cast<int64_t>(*it);
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	988 }
476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	989 catch (boost::bad_lexical_cast&)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	990 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	991 return SeriesStatus_Unknown;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	992 }
3091 476cba12c2b0 IDatabaseWrapper::GetChildrenMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3090 diff changeset	993
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	994 if (!(index > 0 && index <= expectedNumberOfInstances))
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	995 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	996 // Out-of-range instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	997 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	998 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	999
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1000 if (instances.find(index) != instances.end())
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1001 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1002 // Twice the same instance index
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1003 return SeriesStatus_Inconsistent;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1004 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1005
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1006 instances.insert(index);
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1007 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1008
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1009 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
199 dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1010 {
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1011 return SeriesStatus_Complete;
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 else
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 return SeriesStatus_Missing;
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1016 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1017 }
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1018
dfa2899d9960 refactoring cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 198 diff changeset	1019
202 1650557bd81a refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 201 diff changeset	1020 void ServerIndex::MainDicomTagsToJson(Json::Value& target,
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1021 IDatabaseWrapper& db,
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1022 int64_t resourceId,
de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1555 diff changeset	1023 ResourceType resourceType)
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1024 {
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1025 DicomMap tags;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1026 db.GetMainDicomTags(tags, resourceId);
1676 f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1027
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1028 if (resourceType == ResourceType_Study)
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1029 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1030 DicomMap t1, t2;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1031 tags.ExtractStudyInformation(t1);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1032 tags.ExtractPatientInformation(t2);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1033
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1034 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1035 FromDcmtkBridge::ToJson(target["MainDicomTags"], t1, true);
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 target["PatientMainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1038 FromDcmtkBridge::ToJson(target["PatientMainDicomTags"], t2, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1039 }
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1040 else
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1041 {
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1042 target["MainDicomTags"] = Json::objectValue;
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1043 FromDcmtkBridge::ToJson(target["MainDicomTags"], tags, true);
f079f3efe33b patient tags reported in studies Sebastien Jodogne <s.jodogne@gmail.com> parents: 1668 diff changeset	1044 }
198 663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1045 }
663cc6c46d0a before refactoring of ServerIndex::GetXXX Sebastien Jodogne <s.jodogne@gmail.com> parents: 197 diff changeset	1046
3090 31244604f617 starting optimization of SeriesIndex::GetSeriesStatus() Sebastien Jodogne <s.jodogne@gmail.com> parents: 3087 diff changeset	1047
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1048 template <typename T>
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1049 static void FormatLog(Json::Value& target,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1050 const std::list<T>& log,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1051 const std::string& name,
a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1052 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	1053 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	1054 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	1055 int64_t last)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1056 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1057 Json::Value items = Json::arrayValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1058 for (typename std::list<T>::const_iterator
1304 7b6925b0890d cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1300 diff changeset	1059 it = log.begin(); it != log.end(); ++it)
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1060 {
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1061 Json::Value item;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1062 it->Format(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1063 items.append(item);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1064 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1065
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1066 target = Json::objectValue;
1244 a0e420c5f2b8 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1241 diff changeset	1067 target[name] = items;
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1068 target["Done"] = done;
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1069
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1070 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	1071 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1072 // 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	1073 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	1074 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1075 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	1076 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1077 else
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 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	1080 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1081 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3094 diff changeset	1082
1240 62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1083 target["Last"] = static_cast<int>(last);
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1084 }
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1085
62c35e4b67db refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1239 diff changeset	1086
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1087 bool ServerIndex::IsRecyclingNeeded(uint64_t instanceSize)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1088 {
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1089 if (maximumStorageSize_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1090 {
3020 d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	1091 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	1092
d207f6ac1f86 tracking disk size by the database engine to ensure consistency across transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 3019 diff changeset	1093 if (db_.IsDiskSizeAbove(maximumStorageSize_ - instanceSize))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1094 {
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1095 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1096 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1097 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1098
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1099 if (maximumPatients_ != 0)
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1100 {
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1101 uint64_t patientCount = db_.GetResourceCount(ResourceType_Patient);
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1102 if (patientCount > maximumPatients_)
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 return true;
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1105 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1106 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1107
268 4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1108 return false;
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1109 }
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1110
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1111
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1112 void ServerIndex::Recycle(uint64_t instanceSize,
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1113 const std::string& newPatientId)
4bc02e2254ec preparing ServerIndex for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 264 diff changeset	1114 {
4575 e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1115 if (IsRecyclingNeeded(instanceSize))
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1116 {
4575 e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1117 // Check whether other DICOM instances from this patient are
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1118 // already stored
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1119 int64_t patientToAvoid;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1120 bool hasPatientToAvoid;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1121
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1122 if (newPatientId.empty())
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1123 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1124 hasPatientToAvoid = false;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1125 }
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1126 else
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1127 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1128 ResourceType type;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1129 hasPatientToAvoid = db_.LookupResource(patientToAvoid, type, newPatientId);
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1130 if (type != ResourceType_Patient)
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1131 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1132 throw OrthancException(ErrorCode_InternalError);
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1133 }
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1134 }
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1135
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1136 // Iteratively select patient to remove until there is enough
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1137 // space in the DICOM store
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1138 int64_t patientToRecycle;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1139 while (true)
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1140 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1141 // If other instances of this patient are already in the store,
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1142 // we must avoid to recycle them
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1143 bool ok = (hasPatientToAvoid ?
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1144 db_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1145 db_.SelectPatientToRecycle(patientToRecycle));
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1146
4575 e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1147 if (!ok)
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1148 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1149 throw OrthancException(ErrorCode_FullStorage);
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1150 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1151
4575 e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1152 LOG(TRACE) << "Recycling one patient";
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1153 db_.DeleteResource(patientToRecycle);
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1154
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1155 if (!IsRecyclingNeeded(instanceSize))
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1156 {
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1157 // OK, we're done
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1158 break;
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1159 }
269 f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1160 }
f6fdf5abe751 recycling up and running Sebastien Jodogne <s.jodogne@gmail.com> parents: 268 diff changeset	1161 }
4575 e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1162 }
e23bacd4fffc clarifications in ServerIndex::Recycle() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4574 diff changeset	1163
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
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1342 void ServerIndex::NormalizeLookup(std::vector<DatabaseConstraint>& target,
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1343 const DatabaseLookup& source,
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1344 ResourceType queryLevel) const
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1345 {
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1346 assert(mainDicomTagsRegistry_.get() != NULL);
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1347
ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1348 target.clear();
ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1349 target.reserve(source.GetConstraintsCount());
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1350
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1351 for (size_t i = 0; i < source.GetConstraintsCount(); i++)
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1352 {
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1353 ResourceType level;
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1354 DicomTagType type;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1355
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1356 mainDicomTagsRegistry_->LookupTag(level, type, source.GetConstraint(i).GetTag());
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1357
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1358 if (type == DicomTagType_Identifier \|\|
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1359 type == DicomTagType_Main)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1360 {
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1361 // 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	1362 if (level == ResourceType_Patient &&
18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1363 queryLevel != ResourceType_Patient)
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1364 {
3031 18a2d196414b simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 3030 diff changeset	1365 level = ResourceType_Study;
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1366 }
3029 ea653ec47f31 new class: DatabaseConstraint Sebastien Jodogne <s.jodogne@gmail.com> parents: 3027 diff changeset	1367
3073 0e9d1731b1b0 refactoring to reuse DatabaseConstraint in separate projects Sebastien Jodogne <s.jodogne@gmail.com> parents: 3061 diff changeset	1368 target.push_back(source.GetConstraint(i).ConvertToDatabaseConstraint(level, type));
3027 fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1369 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1370 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1371 }
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1372
fd587cf51a89 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 3025 diff changeset	1373
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1374
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1375
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1376
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1377 /***
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1378 ** PROTOTYPING FOR DB REFACTORING BELOW
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1379 ***/
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1380
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1381 namespace
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1382 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1383 /**
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1384 * 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	1385 * of the internal classes.
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1386 **/
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1387
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1388 template <typename Operations,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1389 typename Tuple>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1390 class TupleOperationsWrapper : public ServerIndex::IReadOnlyOperations
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1391 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1392 protected:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1393 Operations& operations_;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1394 const Tuple& tuple_;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1395
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1396 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1397 TupleOperationsWrapper(Operations& operations,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1398 const Tuple& tuple) :
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1399 operations_(operations),
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1400 tuple_(tuple)
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1401 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1402 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1403
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1404 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	1405 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1406 operations_.ApplyTuple(transaction, tuple_);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1407 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1408 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1409
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1410
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1411 template <typename T1>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1412 class ReadOnlyOperationsT1 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1413 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1414 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1415 typedef typename boost::tuple<T1> Tuple;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1416
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1417 virtual ~ReadOnlyOperationsT1()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1418 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1419 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1420
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1421 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1422 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1423
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1424 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1425 T1 t1)
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1426 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1427 const Tuple tuple(t1);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1428 TupleOperationsWrapper<ReadOnlyOperationsT1, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1429 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1430 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1431 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1432
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1433
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1434 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1435 typename T2>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1436 class ReadOnlyOperationsT2 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1437 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1438 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1439 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	1440
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1441 virtual ~ReadOnlyOperationsT2()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1442 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1443 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1444
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1445 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1446 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1447
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1448 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1449 T1 t1,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1450 T2 t2)
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1451 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1452 const Tuple tuple(t1, t2);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1453 TupleOperationsWrapper<ReadOnlyOperationsT2, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1454 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1455 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1456 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1457
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 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1460 typename T2,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1461 typename T3>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1462 class ReadOnlyOperationsT3 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1463 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1464 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1465 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	1466
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1467 virtual ~ReadOnlyOperationsT3()
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 ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1472 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1473
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1474 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1475 T1 t1,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1476 T2 t2,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1477 T3 t3)
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1478 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1479 const Tuple tuple(t1, t2, t3);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1480 TupleOperationsWrapper<ReadOnlyOperationsT3, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1481 index.Apply(wrapper);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1482 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1483 };
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1484
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 template <typename T1,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1487 typename T2,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1488 typename T3,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1489 typename T4>
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1490 class ReadOnlyOperationsT4 : public boost::noncopyable
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1491 {
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1492 public:
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1493 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	1494
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1495 virtual ~ReadOnlyOperationsT4()
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1496 {
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 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1500 const Tuple& tuple) = 0;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1501
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1502 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1503 T1 t1,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1504 T2 t2,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1505 T3 t3,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1506 T4 t4)
4557 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 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	1509 TupleOperationsWrapper<ReadOnlyOperationsT4, Tuple> wrapper(*this, tuple);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1510 index.Apply(wrapper);
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 };
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1513
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1514
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1515 template <typename T1,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1516 typename T2,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1517 typename T3,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1518 typename T4,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1519 typename T5>
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1520 class ReadOnlyOperationsT5 : public boost::noncopyable
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1521 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1522 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1523 typedef typename boost::tuple<T1, T2, T3, T4, T5> Tuple;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1524
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1525 virtual ~ReadOnlyOperationsT5()
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1526 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1527 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1528
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1529 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1530 const Tuple& tuple) = 0;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1531
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1532 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1533 T1 t1,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1534 T2 t2,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1535 T3 t3,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1536 T4 t4,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1537 T5 t5)
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1538 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1539 const Tuple tuple(t1, t2, t3, t4, t5);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1540 TupleOperationsWrapper<ReadOnlyOperationsT5, Tuple> wrapper(*this, tuple);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1541 index.Apply(wrapper);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1542 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1543 };
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1544
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1545
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1546 template <typename T1,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1547 typename T2,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1548 typename T3,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1549 typename T4,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1550 typename T5,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1551 typename T6>
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1552 class ReadOnlyOperationsT6 : public boost::noncopyable
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1553 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1554 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1555 typedef typename boost::tuple<T1, T2, T3, T4, T5, T6> Tuple;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1556
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1557 virtual ~ReadOnlyOperationsT6()
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1558 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1559 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1560
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1561 virtual void ApplyTuple(ServerIndex::ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1562 const Tuple& tuple) = 0;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1563
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1564 void Apply(ServerIndex& index,
4566 f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1565 T1 t1,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1566 T2 t2,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1567 T3 t3,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1568 T4 t4,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1569 T5 t5,
f52d0bc19e07 fix build for msvc2008 Sebastien Jodogne <s.jodogne@gmail.com> parents: 4565 diff changeset	1570 T6 t6)
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1571 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1572 const Tuple tuple(t1, t2, t3, t4, t5, t6);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1573 TupleOperationsWrapper<ReadOnlyOperationsT6, Tuple> wrapper(*this, tuple);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1574 index.Apply(wrapper);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1575 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1576 };
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1577 }
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1578
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1579
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1580 void ServerIndex::ApplyInternal(IReadOnlyOperations* readOperations,
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1581 IReadWriteOperations* writeOperations)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1582 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1583 if ((readOperations == NULL && writeOperations == NULL) \|\|
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1584 (readOperations != NULL && writeOperations != NULL))
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1585 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1586 throw OrthancException(ErrorCode_InternalError);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1587 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1588
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1589 unsigned int count = 0;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1590
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1591 for (;;)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1592 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1593 try
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1594 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1595 boost::mutex::scoped_lock lock(mutex_); // TODO - REMOVE
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1596
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1597 if (readOperations != NULL)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1598 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1599 /**
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1600 * IMPORTANT: In Orthanc <= 1.9.1, there was no transaction
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1601 * 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	1602 * global mutex protecting the database.
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1603 **/
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1604
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1605 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	1606 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1607 ReadOnlyTransaction t(db_);
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1608 readOperations->Apply(t);
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1609 }
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1610 transaction.Commit(0);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1611 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1612 else
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1613 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1614 assert(writeOperations != NULL);
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1615
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1616 Transaction transaction(*this, TransactionType_ReadWrite);
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1617 {
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	1618 assert(listener_.get() != NULL);
f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	1619 ReadWriteTransaction t(db_, listener_, this);
f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	1620 writeOperations->Apply(t);
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1621 }
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1622 transaction.Commit(0);
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1623 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1624
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1625 return; // Success
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1626 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1627 catch (OrthancException& e)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1628 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1629 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1630 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1631 if (count == maxRetries_)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1632 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1633 throw;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1634 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1635 else
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1636 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1637 count++;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1638 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	1639 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1640 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1641 else if (e.GetErrorCode() == ErrorCode_DatabaseUnavailable)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1642 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1643 if (count == maxRetries_)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1644 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1645 throw;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1646 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1647 else
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1648 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1649 count++;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1650 boost::this_thread::sleep(boost::posix_time::milliseconds(1000));
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1651 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1652 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1653 else
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 throw;
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1656 }
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 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1659 }
4561 02510325d869 removed function wrappers for transactions in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4560 diff changeset	1660
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1661
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1662 void ServerIndex::Apply(IReadOnlyOperations& operations)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1663 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1664 ApplyInternal(&operations, NULL);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1665 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1666
4561 02510325d869 removed function wrappers for transactions in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4560 diff changeset	1667
4551 350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1668 void ServerIndex::Apply(IReadWriteOperations& operations)
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1669 {
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1670 ApplyInternal(NULL, &operations);
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1671 }
350a22c094f2 testing replay of transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4514 diff changeset	1672
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1673
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1674 bool ServerIndex::ExpandResource(Json::Value& target,
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1675 const std::string& publicId,
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1676 ResourceType level)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1677 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1678 class Operations : public ReadOnlyOperationsT4<bool&, Json::Value&, const std::string&, ResourceType>
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1679 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1680 private:
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	1681 ServerIndex& index_; // TODO - REMOVE
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1682
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1683 public:
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1684 explicit Operations(ServerIndex& index) :
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1685 index_(index)
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1686 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1687 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1688
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1689 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1690 const Tuple& tuple) ORTHANC_OVERRIDE
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1691 {
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1692 // Lookup for the requested resource
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1693 int64_t internalId; // unused
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1694 ResourceType type;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1695 std::string parent;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1696 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1697 type != tuple.get<3>())
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1698 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1699 tuple.get<0>() = false;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1700 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1701 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1702 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1703 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	1704 target = Json::objectValue;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1705
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1706 // Set information about the parent resource (if it exists)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1707 if (type == ResourceType_Patient)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1708 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1709 if (!parent.empty())
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1710 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1711 throw OrthancException(ErrorCode_DatabasePlugin);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1712 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1713 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1714 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1715 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1716 if (parent.empty())
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1717 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1718 throw OrthancException(ErrorCode_DatabasePlugin);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1719 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1720
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1721 switch (type)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1722 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1723 case ResourceType_Study:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1724 target["ParentPatient"] = parent;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1725 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1726
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1727 case ResourceType_Series:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1728 target["ParentStudy"] = parent;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1729 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1730
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1731 case ResourceType_Instance:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1732 target["ParentSeries"] = parent;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1733 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1734
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1735 default:
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1736 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1737 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1738 }
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 // List the children resources
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1741 std::list<std::string> children;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1742 transaction.GetChildrenPublicId(children, internalId);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1743
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1744 if (type != ResourceType_Instance)
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 Json::Value c = Json::arrayValue;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1747
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1748 for (std::list<std::string>::const_iterator
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1749 it = children.begin(); it != children.end(); ++it)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1750 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1751 c.append(*it);
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 switch (type)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1755 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1756 case ResourceType_Patient:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1757 target["Studies"] = c;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1758 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1759
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1760 case ResourceType_Study:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1761 target["Series"] = c;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1762 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1763
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1764 case ResourceType_Series:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1765 target["Instances"] = c;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1766 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1767
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1768 default:
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1769 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1770 }
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
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1773 // Extract the metadata
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1774 std::map<MetadataType, std::string> metadata;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1775 transaction.GetAllMetadata(metadata, internalId);
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 // Set the resource type
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1778 switch (type)
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 case ResourceType_Patient:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1781 target["Type"] = "Patient";
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1782 break;
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 case ResourceType_Study:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1785 target["Type"] = "Study";
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1786 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1787
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1788 case ResourceType_Series:
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1789 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1790 target["Type"] = "Series";
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1791
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1792 int64_t i;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1793 if (LookupIntegerMetadata(i, metadata, MetadataType_Series_ExpectedNumberOfInstances))
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1794 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1795 target["ExpectedNumberOfInstances"] = static_cast<int>(i);
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1796 target["Status"] = EnumerationToString(transaction.GetSeriesStatus(internalId, i));
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1797 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1798 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1799 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1800 target["ExpectedNumberOfInstances"] = Json::nullValue;
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1801 target["Status"] = EnumerationToString(SeriesStatus_Unknown);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1802 }
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 break;
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
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1807 case ResourceType_Instance:
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1808 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1809 target["Type"] = "Instance";
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1810
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1811 FileInfo attachment;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1812 if (!transaction.LookupAttachment(attachment, internalId, FileContentType_Dicom))
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1813 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1814 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1815 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1816
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1817 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	1818 target["FileUuid"] = attachment.GetUuid();
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1819
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1820 int64_t i;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1821 if (LookupIntegerMetadata(i, metadata, MetadataType_Instance_IndexInSeries))
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1822 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1823 target["IndexInSeries"] = static_cast<int>(i);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1824 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1825 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1826 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1827 target["IndexInSeries"] = Json::nullValue;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1828 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1829
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1830 break;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1831 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1832
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1833 default:
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1834 throw OrthancException(ErrorCode_InternalError);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1835 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1836
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1837 // Record the remaining information
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1838 target["ID"] = tuple.get<2>();
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1839 transaction.MainDicomTagsToJson(target, internalId, type);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1840
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1841 std::string tmp;
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 if (LookupStringMetadata(tmp, metadata, MetadataType_AnonymizedFrom))
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1844 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1845 target["AnonymizedFrom"] = tmp;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1846 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1847
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1848 if (LookupStringMetadata(tmp, metadata, MetadataType_ModifiedFrom))
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1849 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1850 target["ModifiedFrom"] = tmp;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1851 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1852
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1853 if (type == ResourceType_Patient \|\|
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1854 type == ResourceType_Study \|\|
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1855 type == ResourceType_Series)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1856 {
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1857 target["IsStable"] = !index_.IsUnstableResource(internalId);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1858
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1859 if (LookupStringMetadata(tmp, metadata, MetadataType_LastUpdate))
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["LastUpdate"] = tmp;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1862 }
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
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1865 tuple.get<0>() = true;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1866 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1867 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1868 };
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1869
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1870 bool found;
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1871 Operations operations(*this);
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1872 operations.Apply(*this, found, target, publicId, level);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1873 return found;
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1874 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1875
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1876
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1877 void ServerIndex::GetAllMetadata(std::map<MetadataType, std::string>& target,
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1878 const std::string& publicId,
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1879 ResourceType level)
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1880 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1881 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	1882 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1883 public:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1884 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1885 const Tuple& tuple) ORTHANC_OVERRIDE
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1886 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1887 ResourceType type;
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1888 int64_t id;
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1889 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	1890 tuple.get<2>() != type)
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1891 {
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1892 throw OrthancException(ErrorCode_UnknownResource);
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1893 }
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1894 else
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1895 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1896 transaction.GetAllMetadata(tuple.get<0>(), id);
4554 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 };
efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1900
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1901 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1902 operations.Apply(*this, target, publicId, level);
4554 efd90f778cd2 simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4551 diff changeset	1903 }
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1904
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1905
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1906 bool ServerIndex::LookupAttachment(FileInfo& attachment,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1907 const std::string& instancePublicId,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1908 FileContentType contentType)
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1909 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1910 class Operations : public ReadOnlyOperationsT4<bool&, FileInfo&, const std::string&, FileContentType>
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1911 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1912 public:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1913 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1914 const Tuple& tuple) ORTHANC_OVERRIDE
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1915 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1916 int64_t internalId;
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1917 ResourceType type;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1918 if (!transaction.LookupResource(internalId, type, tuple.get<2>()))
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1919 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1920 throw OrthancException(ErrorCode_UnknownResource);
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1921 }
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1922 else if (transaction.LookupAttachment(tuple.get<1>(), internalId, tuple.get<3>()))
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1923 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1924 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	1925 tuple.get<0>() = true;
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1926 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1927 else
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1928 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1929 tuple.get<0>() = false;
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1930 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1931 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1932 };
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1933
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1934 bool found;
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1935 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1936 operations.Apply(*this, found, attachment, instancePublicId, contentType);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	1937 return found;
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1938 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1939
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1940
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1941 void ServerIndex::GetAllUuids(std::list<std::string>& target,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1942 ResourceType resourceType)
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1943 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1944 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, ResourceType>
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1945 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1946 public:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1947 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1948 const Tuple& tuple) ORTHANC_OVERRIDE
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1949 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1950 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1951 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>());
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1952 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1953 };
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1954
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1955 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1956 operations.Apply(*this, target, resourceType);
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1957 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1958
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1959
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1960 void ServerIndex::GetAllUuids(std::list<std::string>& target,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1961 ResourceType resourceType,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1962 size_t since,
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1963 size_t limit)
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1964 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1965 if (limit == 0)
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1966 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1967 target.clear();
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1968 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1969 else
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1970 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1971 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	1972 {
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1973 public:
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1974 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1975 const Tuple& tuple) ORTHANC_OVERRIDE
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1976 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	1977 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1978 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	1979 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1980 };
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1981
4557 b6d4b735eb4d templates to reduce verbosity in ServerIndex implementation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1982 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1983 operations.Apply(*this, target, resourceType, since, limit);
4555 456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1984 }
456ed3fcff81 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4554 diff changeset	1985 }
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1986
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1987
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1988 void ServerIndex::GetGlobalStatistics(/* out */ uint64_t& diskSize,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1989 /* out */ uint64_t& uncompressedSize,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1990 /* out */ uint64_t& countPatients,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1991 /* out */ uint64_t& countStudies,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1992 /* out */ uint64_t& countSeries,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1993 /* out */ uint64_t& countInstances)
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1994 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	1995 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	1996 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1997 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1998 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	1999 const Tuple& tuple) ORTHANC_OVERRIDE
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2000 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2001 tuple.get<0>() = transaction.GetTotalCompressedSize();
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2002 tuple.get<1>() = transaction.GetTotalUncompressedSize();
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2003 tuple.get<2>() = transaction.GetResourceCount(ResourceType_Patient);
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2004 tuple.get<3>() = transaction.GetResourceCount(ResourceType_Study);
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2005 tuple.get<4>() = transaction.GetResourceCount(ResourceType_Series);
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2006 tuple.get<5>() = transaction.GetResourceCount(ResourceType_Instance);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2007 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2008 };
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2009
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2010 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2011 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2012 countStudies, countSeries, countInstances);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2013 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2014
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2015
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2016 void ServerIndex::GetChanges(Json::Value& target,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2017 int64_t since,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2018 unsigned int maxResults)
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2019 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2020 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2021 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2022 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2023 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2024 const Tuple& tuple) ORTHANC_OVERRIDE
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2025 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2026 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2027 // "GetLastChange()" involves calls to "GetPublicId()"
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2028
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2029 std::list<ServerIndexChange> changes;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2030 bool done;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2031 bool hasLast = false;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2032 int64_t last = 0;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2033
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2034 transaction.GetChanges(changes, done, tuple.get<1>(), tuple.get<2>());
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2035 if (changes.empty())
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2036 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2037 last = transaction.GetLastChangeIndex();
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2038 hasLast = true;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2039 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2040
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2041 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	2042 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2043 };
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2044
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2045 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2046 operations.Apply(*this, target, since, maxResults);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2047 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2048
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2049
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2050 void ServerIndex::GetLastChange(Json::Value& target)
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2051 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2052 class Operations : public ReadOnlyOperationsT1<Json::Value&>
4558 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 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2055 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2056 const Tuple& tuple) ORTHANC_OVERRIDE
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2057 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2058 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2059 // "GetLastChange()" involves calls to "GetPublicId()"
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2060
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2061 std::list<ServerIndexChange> changes;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2062 bool hasLast = false;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2063 int64_t last = 0;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2064
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2065 transaction.GetLastChange(changes);
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2066 if (changes.empty())
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2067 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2068 last = transaction.GetLastChangeIndex();
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2069 hasLast = true;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2070 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2071
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2072 FormatLog(tuple.get<0>(), changes, "Changes", true, 0, hasLast, last);
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, target);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2078 }
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 void ServerIndex::GetExportedResources(Json::Value& target,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2082 int64_t since,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2083 unsigned int maxResults)
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2084 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2085 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2086 {
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2087 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2088 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2089 const Tuple& tuple) ORTHANC_OVERRIDE
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2090 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2091 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2092
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2093 std::list<ExportedResource> exported;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2094 bool done;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2095 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	2096 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	2097 }
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2098 };
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 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2101 operations.Apply(*this, target, since, maxResults);
4558 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
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2104
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2105 void ServerIndex::GetLastExportedResource(Json::Value& target)
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 class Operations : public ReadOnlyOperationsT1<Json::Value&>
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 public:
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2110 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2111 const Tuple& tuple) ORTHANC_OVERRIDE
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2112 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2113 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4558 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 std::list<ExportedResource> exported;
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2116 transaction.GetLastExportedResource(exported);
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2117 FormatLog(tuple.get<0>(), exported, "Exports", true, 0, false, -1);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2118 }
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
2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2121 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2122 operations.Apply(*this, target);
4558 2f4d7ec9b993 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4557 diff changeset	2123 }
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2124
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2125
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2126 bool ServerIndex::IsProtectedPatient(const std::string& publicId)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2127 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2128 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2129 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2130 public:
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2131 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2132 const Tuple& tuple) ORTHANC_OVERRIDE
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2133 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2134 // Lookup for the requested resource
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2135 int64_t id;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2136 ResourceType type;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2137 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2138 type != ResourceType_Patient)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2139 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2140 throw OrthancException(ErrorCode_ParameterOutOfRange);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2141 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2142 else
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2143 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2144 tuple.get<0>() = transaction.IsProtectedPatient(id);
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2145 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2146 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2147 };
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2148
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2149 bool isProtected;
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2150 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2151 operations.Apply(*this, isProtected, publicId);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2152 return isProtected;
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2153 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2154
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2155
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2156 void ServerIndex::GetChildren(std::list<std::string>& result,
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2157 const std::string& publicId)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2158 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2159 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2160 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2161 public:
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2162 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2163 const Tuple& tuple) ORTHANC_OVERRIDE
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2164 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2165 ResourceType type;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2166 int64_t resource;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2167 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2168 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2169 throw OrthancException(ErrorCode_UnknownResource);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2170 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2171 else if (type == ResourceType_Instance)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2172 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2173 // An instance cannot have a child
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2174 throw OrthancException(ErrorCode_BadParameterType);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2175 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2176 else
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2177 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2178 std::list<int64_t> tmp;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2179 transaction.GetChildrenInternalId(tmp, resource);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2180
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2181 tuple.get<0>().clear();
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2182
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2183 for (std::list<int64_t>::const_iterator
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2184 it = tmp.begin(); it != tmp.end(); ++it)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2185 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2186 tuple.get<0>().push_back(transaction.GetPublicId(*it));
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2187 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2188 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2189 }
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 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2193 operations.Apply(*this, result, publicId);
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2194 }
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
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2197 void ServerIndex::GetChildInstances(std::list<std::string>& result,
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2198 const std::string& publicId)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2199 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2200 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2201 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2202 public:
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2203 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2204 const Tuple& tuple) ORTHANC_OVERRIDE
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2205 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2206 tuple.get<0>().clear();
4559 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 ResourceType type;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2209 int64_t top;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2210 if (!transaction.LookupResource(top, type, tuple.get<1>()))
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 throw OrthancException(ErrorCode_UnknownResource);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2213 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2214 else if (type == ResourceType_Instance)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2215 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2216 // 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	2217 tuple.get<0>().push_back(tuple.get<1>());
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2218 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2219 else
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 std::stack<int64_t> toExplore;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2222 toExplore.push(top);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2223
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2224 std::list<int64_t> tmp;
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2225 while (!toExplore.empty())
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 // Get the internal ID of the current resource
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2228 int64_t resource = toExplore.top();
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2229 toExplore.pop();
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 // TODO - This could be optimized by seeing how many
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2232 // levels "type == transaction.GetResourceType(top)" is
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2233 // above the "instances level"
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2234 if (transaction.GetResourceType(resource) == ResourceType_Instance)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2235 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2236 tuple.get<0>().push_back(transaction.GetPublicId(resource));
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2237 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2238 else
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2239 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2240 // Tag all the children of this resource as to be explored
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2241 transaction.GetChildrenInternalId(tmp, resource);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2242 for (std::list<int64_t>::const_iterator
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2243 it = tmp.begin(); it != tmp.end(); ++it)
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2244 {
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2245 toExplore.push(*it);
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2246 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2247 }
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 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2250 }
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2251 };
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2252
19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2253 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2254 operations.Apply(*this, result, publicId);
4559 19b1921aee06 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4558 diff changeset	2255 }
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2256
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2257
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2258 bool ServerIndex::LookupMetadata(std::string& target,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2259 const std::string& publicId,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2260 ResourceType expectedType,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2261 MetadataType type)
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2262 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2263 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	2264 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2265 public:
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2266 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2267 const Tuple& tuple) ORTHANC_OVERRIDE
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2268 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2269 ResourceType rtype;
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2270 int64_t id;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2271 if (!transaction.LookupResource(id, rtype, tuple.get<2>()) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2272 rtype != tuple.get<3>())
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2273 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2274 throw OrthancException(ErrorCode_UnknownResource);
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2275 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2276 else
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2277 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2278 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	2279 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2280 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2281 };
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2282
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2283 bool found;
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2284 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2285 operations.Apply(*this, found, target, publicId, expectedType, type);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2286 return found;
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2287 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2288
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2289
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2290 void ServerIndex::ListAvailableAttachments(std::set<FileContentType>& target,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2291 const std::string& publicId,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2292 ResourceType expectedType)
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2293 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2294 class Operations : public ReadOnlyOperationsT3<std::set<FileContentType>&, const std::string&, ResourceType>
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2295 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2296 public:
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2297 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2298 const Tuple& tuple) ORTHANC_OVERRIDE
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2299 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2300 ResourceType type;
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2301 int64_t id;
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2302 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2303 tuple.get<2>() != type)
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2304 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2305 throw OrthancException(ErrorCode_UnknownResource);
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2306 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2307 else
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2308 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2309 transaction.ListAvailableAttachments(tuple.get<0>(), id);
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2310 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2311 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2312 };
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2313
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2314 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2315 operations.Apply(*this, target, publicId, expectedType);
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2316 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2317
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2318
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2319 bool ServerIndex::LookupParent(std::string& target,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2320 const std::string& publicId)
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2321 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2322 class Operations : public ReadOnlyOperationsT3<bool&, std::string&, const std::string&>
4560 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 public:
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2325 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2326 const Tuple& tuple) ORTHANC_OVERRIDE
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2327 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2328 ResourceType type;
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2329 int64_t id;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2330 if (!transaction.LookupResource(id, type, tuple.get<2>()))
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2331 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2332 throw OrthancException(ErrorCode_UnknownResource);
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2333 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2334 else
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2335 {
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2336 int64_t parentId;
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2337 if (transaction.LookupParent(parentId, id))
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2338 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2339 tuple.get<1>() = transaction.GetPublicId(parentId);
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2340 tuple.get<0>() = true;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2341 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2342 else
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 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>() = false;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2345 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2346 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2347 }
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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2350 bool found;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2351 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2352 operations.Apply(*this, found, target, publicId);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2353 return found;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2354 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2355
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2356
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2357 void ServerIndex::GetResourceStatistics(/* out */ ResourceType& type,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2358 /* out */ uint64_t& diskSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2359 /* out */ uint64_t& uncompressedSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2360 /* out */ unsigned int& countStudies,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2361 /* out */ unsigned int& countSeries,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2362 /* out */ unsigned int& countInstances,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2363 /* out */ uint64_t& dicomDiskSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2364 /* out */ uint64_t& dicomUncompressedSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2365 const std::string& publicId)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2366 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2367 class Operations : public ServerIndex::IReadOnlyOperations
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2368 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2369 private:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2370 ResourceType& type_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2371 uint64_t& diskSize_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2372 uint64_t& uncompressedSize_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2373 unsigned int& countStudies_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2374 unsigned int& countSeries_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2375 unsigned int& countInstances_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2376 uint64_t& dicomDiskSize_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2377 uint64_t& dicomUncompressedSize_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2378 const std::string& publicId_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2379
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2380 public:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2381 explicit Operations(ResourceType& type,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2382 uint64_t& diskSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2383 uint64_t& uncompressedSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2384 unsigned int& countStudies,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2385 unsigned int& countSeries,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2386 unsigned int& countInstances,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2387 uint64_t& dicomDiskSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2388 uint64_t& dicomUncompressedSize,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2389 const std::string& publicId) :
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2390 type_(type),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2391 diskSize_(diskSize),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2392 uncompressedSize_(uncompressedSize),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2393 countStudies_(countStudies),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2394 countSeries_(countSeries),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2395 countInstances_(countInstances),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2396 dicomDiskSize_(dicomDiskSize),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2397 dicomUncompressedSize_(dicomUncompressedSize),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2398 publicId_(publicId)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2399 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2400 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2401
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2402 virtual void Apply(ServerIndex::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2403 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2404 int64_t top;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2405 if (!transaction.LookupResource(top, type_, publicId_))
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2406 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2407 throw OrthancException(ErrorCode_UnknownResource);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2408 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2409 else
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2410 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2411 countInstances_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2412 countSeries_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2413 countStudies_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2414 diskSize_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2415 uncompressedSize_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2416 dicomDiskSize_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2417 dicomUncompressedSize_ = 0;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2418
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2419 std::stack<int64_t> toExplore;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2420 toExplore.push(top);
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 while (!toExplore.empty())
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2423 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2424 // Get the internal ID of the current resource
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2425 int64_t resource = toExplore.top();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2426 toExplore.pop();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2427
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2428 ResourceType thisType = transaction.GetResourceType(resource);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2429
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2430 std::set<FileContentType> f;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2431 transaction.ListAvailableAttachments(f, resource);
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 for (std::set<FileContentType>::const_iterator
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2434 it = f.begin(); it != f.end(); ++it)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2435 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2436 FileInfo attachment;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2437 if (transaction.LookupAttachment(attachment, resource, *it))
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2438 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2439 if (attachment.GetContentType() == FileContentType_Dicom)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2440 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2441 dicomDiskSize_ += attachment.GetCompressedSize();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2442 dicomUncompressedSize_ += attachment.GetUncompressedSize();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2443 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2444
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2445 diskSize_ += attachment.GetCompressedSize();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2446 uncompressedSize_ += attachment.GetUncompressedSize();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2447 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2448 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2449
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2450 if (thisType == ResourceType_Instance)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2451 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2452 countInstances_++;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2453 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2454 else
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2455 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2456 switch (thisType)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2457 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2458 case ResourceType_Study:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2459 countStudies_++;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2460 break;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2461
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2462 case ResourceType_Series:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2463 countSeries_++;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2464 break;
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 default:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2467 break;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2468 }
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 // Tag all the children of this resource as to be explored
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2471 std::list<int64_t> tmp;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2472 transaction.GetChildrenInternalId(tmp, resource);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2473 for (std::list<int64_t>::const_iterator
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2474 it = tmp.begin(); it != tmp.end(); ++it)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2475 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2476 toExplore.push(*it);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2477 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2478 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2479 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2480
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2481 if (countStudies_ == 0)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2482 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2483 countStudies_ = 1;
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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2486 if (countSeries_ == 0)
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 countSeries_ = 1;
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2489 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2490 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2491 }
929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2492 };
4562 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 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2495 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2496 Apply(operations);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2497 }
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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2500 void ServerIndex::LookupIdentifierExact(std::vector<std::string>& result,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2501 ResourceType level,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2502 const DicomTag& tag,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2503 const std::string& value)
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 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2506 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2507 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2508 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2509 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2510
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2511 result.clear();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2512
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2513 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
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 std::vector<DatabaseConstraint> query;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2516 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2519 class Operations : public ServerIndex::IReadOnlyOperations
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2520 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2521 private:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2522 std::vector<std::string>& result_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2523 const std::vector<DatabaseConstraint>& query_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2524 ResourceType level_;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2525
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2526 public:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2527 Operations(std::vector<std::string>& result,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2528 const std::vector<DatabaseConstraint>& query,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2529 ResourceType level) :
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2530 result_(result),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2531 query_(query),
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2532 level_(level)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2533 {
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 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2537 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2538 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2539 std::list<std::string> tmp;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2540 transaction.ApplyLookupResources(tmp, NULL, query_, level_, 0);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2541 CopyListToVector(result_, tmp);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2542 }
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 Operations operations(result, query, level);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2546 Apply(operations);
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2547 }
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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2550 bool ServerIndex::LookupGlobalProperty(std::string& value,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2551 GlobalProperty property)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2552 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2553 class Operations : public ReadOnlyOperationsT3<bool&, std::string&, GlobalProperty>
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2554 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2555 public:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2556 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2557 const Tuple& tuple) ORTHANC_OVERRIDE
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2558 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2559 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2560 tuple.get<0>() = transaction.LookupGlobalProperty(tuple.get<1>(), tuple.get<2>());
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2561 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2562 };
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 bool found;
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2565 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2566 operations.Apply(*this, found, value, property);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2567 return found;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2568 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2569
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 std::string ServerIndex::GetGlobalProperty(GlobalProperty property,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2572 const std::string& defaultValue)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2573 {
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2574 std::string s;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2575 if (LookupGlobalProperty(s, property))
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2576 {
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2577 return s;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2578 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2579 else
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2580 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2581 return defaultValue;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2582 }
4562 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
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2586 bool ServerIndex::GetMainDicomTags(DicomMap& result,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2587 const std::string& publicId,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2588 ResourceType expectedType,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2589 ResourceType levelOfInterest)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2590 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2591 // 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	2592 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2593 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2594 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2595 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2596 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2597 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2598 throw OrthancException(ErrorCode_ParameterOutOfRange);
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
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2602 class Operations : public ReadOnlyOperationsT5<bool&, DicomMap&, const std::string&, ResourceType, ResourceType>
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2603 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2604 public:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2605 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2606 const Tuple& tuple) ORTHANC_OVERRIDE
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2607 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2608 // Lookup for the requested resource
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2609 int64_t id;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2610 ResourceType type;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2611 if (!transaction.LookupResource(id, type, tuple.get<2>()) \|\|
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2612 type != tuple.get<3>())
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2613 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2614 tuple.get<0>() = false;
4562 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 else if (type == ResourceType_Study)
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2617 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2618 DicomMap tmp;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2619 transaction.GetMainDicomTags(tmp, id);
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 switch (tuple.get<4>())
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2622 {
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2623 case ResourceType_Patient:
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2624 tmp.ExtractPatientInformation(tuple.get<1>());
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2625 tuple.get<0>() = true;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2626 break;
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 case ResourceType_Study:
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2629 tmp.ExtractStudyInformation(tuple.get<1>());
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2630 tuple.get<0>() = true;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2631 break;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2632
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2633 default:
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2634 throw OrthancException(ErrorCode_InternalError);
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 else
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2638 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2639 transaction.GetMainDicomTags(tuple.get<1>(), id);
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2640 tuple.get<0>() = true;
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2641 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2642 }
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2643 };
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2644
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2645 result.Clear();
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2646
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2647 bool found;
e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2648 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2649 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
4562 e19f11e08226 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4561 diff changeset	2650 return found;
4560 929409e40008 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4559 diff changeset	2651 }
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2652
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2653
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2654 bool ServerIndex::GetAllMainDicomTags(DicomMap& result,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2655 const std::string& instancePublicId)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2656 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2657 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	2658 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2659 public:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2660 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2661 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2662 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2663 // Lookup for the requested resource
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2664 int64_t instance;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2665 ResourceType type;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2666 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	2667 type != ResourceType_Instance)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2668 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2669 tuple.get<0>() = false;
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2670 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2671 else
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2672 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2673 DicomMap tmp;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2674
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2675 transaction.GetMainDicomTags(tmp, instance);
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2676 tuple.get<1>().Merge(tmp);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2677
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2678 int64_t series;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2679 if (!transaction.LookupParent(series, instance))
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2680 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2681 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2682 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2683
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2684 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2685 transaction.GetMainDicomTags(tmp, series);
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2686 tuple.get<1>().Merge(tmp);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2687
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2688 int64_t study;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2689 if (!transaction.LookupParent(study, series))
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2690 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2691 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2692 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2693
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2694 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2695 transaction.GetMainDicomTags(tmp, study);
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2696 tuple.get<1>().Merge(tmp);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2697
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2698 #ifndef NDEBUG
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2699 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2700 // 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	2701 // 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	2702
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2703 int64_t patient;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2704 if (!transaction.LookupParent(patient, study))
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2705 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2706 throw OrthancException(ErrorCode_InternalError);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2707 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2708
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2709 tmp.Clear();
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2710 transaction.GetMainDicomTags(tmp, study);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2711
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2712 std::set<DicomTag> patientTags;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2713 tmp.GetTags(patientTags);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2714
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2715 for (std::set<DicomTag>::const_iterator
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2716 it = patientTags.begin(); it != patientTags.end(); ++it)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2717 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2718 assert(tuple.get<1>().HasTag(*it));
4563 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 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2721 #endif
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 tuple.get<0>() = true;
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 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2726 };
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2727
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2728 result.Clear();
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2729
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2730 bool found;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2731 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2732 operations.Apply(*this, found, result, instancePublicId);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2733 return found;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2734 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2735
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2736
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2737 bool ServerIndex::LookupResourceType(ResourceType& type,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2738 const std::string& publicId)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2739 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2740 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	2741 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2742 public:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2743 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2744 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2745 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2746 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2747 int64_t id;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2748 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	2749 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2750 };
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2751
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2752 bool found;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2753 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2754 operations.Apply(*this, found, type, publicId);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2755 return found;
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
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 unsigned int ServerIndex::GetDatabaseVersion()
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2760 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2761 class Operations : public ReadOnlyOperationsT1<unsigned int&>
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2762 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2763 public:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2764 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2765 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2766 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2767 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2768 tuple.get<0>() = transaction.GetDatabaseVersion();
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2769 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2770 };
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2771
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2772 unsigned int version;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2773 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2774 operations.Apply(*this, version);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2775 return version;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2776 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2777
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2778
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2779 bool ServerIndex::LookupParent(std::string& target,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2780 const std::string& publicId,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2781 ResourceType parentType)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2782 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2783 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	2784 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2785 public:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2786 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2787 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2788 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2789 ResourceType type;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2790 int64_t id;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2791 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	2792 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2793 throw OrthancException(ErrorCode_UnknownResource);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2794 }
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 while (type != tuple.get<3>())
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2797 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2798 int64_t parentId;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2799
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2800 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	2801 !transaction.LookupParent(parentId, id))
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2802 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2803 tuple.get<0>() = false;
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2804 return;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2805 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2806
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2807 id = parentId;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2808 type = GetParentResourceType(type);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2809 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2810
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2811 tuple.get<0>() = true;
5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2812 tuple.get<1>() = transaction.GetPublicId(id);
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2813 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2814 };
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2815
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2816 bool found;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2817 Operations operations;
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2818 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	2819 return found;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2820 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2821
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2822
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2823 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	2824 std::vector<std::string>* instancesId,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2825 const DatabaseLookup& lookup,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2826 ResourceType queryLevel,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2827 size_t limit)
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2828 {
4564 5a0adc1c19a9 avoid copy of objects in ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 4563 diff changeset	2829 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	2830 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2831 private:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2832 std::list<std::string> resourcesList_;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2833 std::list<std::string> instancesList_;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2834
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2835 public:
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2836 const std::list<std::string>& GetResourcesList() const
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 return resourcesList_;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2839 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2840
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2841 const std::list<std::string>& GetInstancesList() const
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 return instancesList_;
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
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2846 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2847 const Tuple& tuple) ORTHANC_OVERRIDE
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2848 {
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4569 diff changeset	2849 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4563 bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2850 if (tuple.get<0>())
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2851 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2852 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	2853 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2854 else
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2855 {
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2856 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	2857 }
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 };
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 std::vector<DatabaseConstraint> normalized;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2863 NormalizeLookup(normalized, lookup, queryLevel);
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2864
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2865 Operations operations;
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2866 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	2867
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2868 CopyListToVector(resourcesId, operations.GetResourcesList());
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2869
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2870 if (instancesId != NULL)
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 CopyListToVector(*instancesId, operations.GetInstancesList());
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2873 }
bb1c365f9e44 end of refactoring read-only transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4562 diff changeset	2874 }
4565 3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2875
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2876
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2877 bool ServerIndex::DeleteResource(Json::Value& target,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2878 const std::string& uuid,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2879 ResourceType expectedType)
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2880 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2881 class Operations : public IReadWriteOperations
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2882 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2883 private:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2884 bool found_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2885 Json::Value& target_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2886 const std::string& uuid_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2887 ResourceType expectedType_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2888
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2889 public:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2890 Operations(Json::Value& target,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2891 const std::string& uuid,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2892 ResourceType expectedType) :
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2893 found_(false),
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2894 target_(target),
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2895 uuid_(uuid),
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2896 expectedType_(expectedType)
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2897 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2898 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2899
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2900 bool IsFound() const
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2901 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2902 return found_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2903 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2904
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	2905 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4565 3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2906 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2907 int64_t id;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2908 ResourceType type;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2909 if (!transaction.LookupResource(id, type, uuid_) \|\|
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2910 expectedType_ != type)
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2911 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2912 found_ = false;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2913 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2914 else
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2915 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2916 found_ = true;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2917 transaction.DeleteResource(id);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2918
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	2919 if (transaction.GetListener().HasRemainingLevel())
4565 3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2920 {
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	2921 ResourceType remainingType = transaction.GetListener().GetRemainingType();
f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	2922 const std::string& remainingUuid = transaction.GetListener().GetRemainingPublicId();
4565 3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2923
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2924 target_["RemainingAncestor"] = Json::Value(Json::objectValue);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2925 target_["RemainingAncestor"]["Path"] = GetBasePath(remainingType, remainingUuid);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2926 target_["RemainingAncestor"]["Type"] = EnumerationToString(remainingType);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2927 target_["RemainingAncestor"]["ID"] = remainingUuid;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2928 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2929 else
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2930 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2931 target_["RemainingAncestor"] = Json::nullValue;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2932 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2933 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2934 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2935 };
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2936
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2937 Operations operations(target, uuid, expectedType);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2938 Apply(operations);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2939 return operations.IsFound();
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2940 }
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 void ServerIndex::LogExportedResource(const std::string& publicId,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2944 const std::string& remoteModality)
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2945 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2946 class Operations : public IReadWriteOperations
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2947 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2948 private:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2949 const std::string& publicId_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2950 const std::string& remoteModality_;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2951
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2952 public:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2953 Operations(const std::string& publicId,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2954 const std::string& remoteModality) :
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2955 publicId_(publicId),
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2956 remoteModality_(remoteModality)
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2957 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2958 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2959
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	2960 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4565 3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2961 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2962 int64_t id;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2963 ResourceType type;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2964 if (!transaction.LookupResource(id, type, publicId_))
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 throw OrthancException(ErrorCode_InexistentItem);
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
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2969 std::string patientId;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2970 std::string studyInstanceUid;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2971 std::string seriesInstanceUid;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2972 std::string sopInstanceUid;
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 currentId = id;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2975 ResourceType currentType = type;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2976
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2977 // 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	2978 bool done = false;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2979 while (!done)
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 DicomMap map;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2982 transaction.GetMainDicomTags(map, currentId);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2983
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2984 switch (currentType)
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 case ResourceType_Patient:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2987 if (map.HasTag(DICOM_TAG_PATIENT_ID))
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2988 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2989 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
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 done = true;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2992 break;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2993
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2994 case ResourceType_Study:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2995 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2996 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2997 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	2998 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	2999 currentType = ResourceType_Patient;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3000 break;
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 case ResourceType_Series:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3003 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3004 {
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3005 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	3006 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3007 currentType = ResourceType_Study;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3008 break;
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 case ResourceType_Instance:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3011 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
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 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	3014 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3015 currentType = ResourceType_Series;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3016 break;
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3017
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3018 default:
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3019 throw OrthancException(ErrorCode_InternalError);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3020 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3021
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3022 // 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	3023 // the current resource
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3024 if (!done)
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 bool ok = transaction.LookupParent(currentId, currentId);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3027 (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	3028 assert(ok);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3029 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3030 }
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3031
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3032 ExportedResource resource(-1,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3033 type,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3034 publicId_,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3035 remoteModality_,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3036 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	3037 patientId,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3038 studyInstanceUid,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3039 seriesInstanceUid,
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3040 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 transaction.LogExportedResource(resource);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3043 }
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
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3046 Operations operations(publicId, remoteModality);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3047 Apply(operations);
3495a3d97ab6 start of read-write transactions Sebastien Jodogne <s.jodogne@gmail.com> parents: 4564 diff changeset	3048 }
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3049
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3050
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3051 void ServerIndex::SetProtectedPatient(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3052 bool isProtected)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3053 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3054 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3055 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3056 private:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3057 const std::string& publicId_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3058 bool isProtected_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3059
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3060 public:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3061 Operations(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3062 bool isProtected) :
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3063 publicId_(publicId),
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3064 isProtected_(isProtected)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3065 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3066 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3067
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3068 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3069 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3070 // Lookup for the requested resource
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3071 int64_t id;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3072 ResourceType type;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3073 if (!transaction.LookupResource(id, type, publicId_) \|\|
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3074 type != ResourceType_Patient)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3075 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3076 throw OrthancException(ErrorCode_ParameterOutOfRange);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3077 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3078 else
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3079 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3080 transaction.SetProtectedPatient(id, isProtected_);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3081 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3082 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3083 };
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3084
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3085 Operations operations(publicId, isProtected);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3086 Apply(operations);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3087
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3088 if (isProtected)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3089 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3090 LOG(INFO) << "Patient " << publicId << " has been protected";
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3091 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3092 else
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3093 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3094 LOG(INFO) << "Patient " << publicId << " has been unprotected";
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3095 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3096 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3097
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3098
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3099 void ServerIndex::SetMetadata(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3100 MetadataType type,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3101 const std::string& value)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3102 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3103 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3104 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3105 private:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3106 const std::string& publicId_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3107 MetadataType type_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3108 const std::string& value_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3109
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3110 public:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3111 Operations(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3112 MetadataType type,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3113 const std::string& value) :
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3114 publicId_(publicId),
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3115 type_(type),
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3116 value_(value)
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
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3120 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 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 ResourceType rtype;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3123 int64_t id;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3124 if (!transaction.LookupResource(id, rtype, publicId_))
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3125 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3126 throw OrthancException(ErrorCode_UnknownResource);
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 else
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3129 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3130 transaction.SetMetadata(id, type_, value_);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3131
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3132 if (IsUserMetadata(type_))
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 transaction.LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId_);
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 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3137 }
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
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3140 Operations operations(publicId, type, value);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3141 Apply(operations);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3142 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3143
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 void ServerIndex::DeleteMetadata(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3146 MetadataType type)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3147 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3148 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3149 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3150 private:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3151 const std::string& publicId_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3152 MetadataType type_;
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 public:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3155 Operations(const std::string& publicId,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3156 MetadataType type) :
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3157 publicId_(publicId),
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3158 type_(type)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3159 {
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
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3162 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3163 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3164 ResourceType rtype;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3165 int64_t id;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3166 if (!transaction.LookupResource(id, rtype, publicId_))
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 throw OrthancException(ErrorCode_UnknownResource);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3169 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3170 else
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 transaction.DeleteMetadata(id, type_);
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 if (IsUserMetadata(type_))
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3175 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3176 transaction.LogChange(id, ChangeType_UpdatedMetadata, rtype, publicId_);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3177 }
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 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3180 };
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3181
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3182 Operations operations(publicId, type);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3183 Apply(operations);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3184 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3185
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 uint64_t ServerIndex::IncrementGlobalSequence(GlobalProperty sequence)
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 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3190 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3191 private:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3192 uint64_t newValue_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3193 GlobalProperty sequence_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3194
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3195 public:
4569 19ea4ecd6d9a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4568 diff changeset	3196 explicit Operations(GlobalProperty sequence) :
19ea4ecd6d9a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4568 diff changeset	3197 newValue_(0), // Dummy initialization
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3198 sequence_(sequence)
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 }
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 uint64_t GetNewValue() const
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 return newValue_;
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
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3207 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 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 std::string oldString;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3210
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3211 if (transaction.LookupGlobalProperty(oldString, sequence_))
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 uint64_t oldValue;
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 try
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3216 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3217 oldValue = boost::lexical_cast<uint64_t>(oldString);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3218 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3219 catch (boost::bad_lexical_cast&)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3220 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3221 LOG(ERROR) << "Cannot read the global sequence "
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3222 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3223 oldValue = 0;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3224 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3225
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3226 newValue_ = oldValue + 1;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3227 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3228 else
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 // Initialize the sequence at "1"
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3231 newValue_ = 1;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3232 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3233
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3234 transaction.SetGlobalProperty(sequence_, boost::lexical_cast<std::string>(newValue_));
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3235 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3236 };
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3237
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3238 Operations operations(sequence);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3239 Apply(operations);
4569 19ea4ecd6d9a cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 4568 diff changeset	3240 assert(operations.GetNewValue() != 0);
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3241 return operations.GetNewValue();
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
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 void ServerIndex::DeleteChanges()
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 class Operations : public IReadWriteOperations
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 public:
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3250 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 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 transaction.ClearChanges();
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3253 }
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3254 };
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 Operations operations;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3257 Apply(operations);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3258 }
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
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3261 void ServerIndex::DeleteExportedResources()
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3262 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3263 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3264 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3265 public:
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3266 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3267 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3268 transaction.ClearExportedResources();
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3269 }
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 Operations operations;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3273 Apply(operations);
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
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 void ServerIndex::SetGlobalProperty(GlobalProperty property,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3278 const std::string& value)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3279 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3280 class Operations : public IReadWriteOperations
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3281 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3282 private:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3283 GlobalProperty property_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3284 const std::string& value_;
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3285
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3286 public:
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3287 Operations(GlobalProperty property,
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3288 const std::string& value) :
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3289 property_(property),
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3290 value_(value)
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3291 {
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
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3294 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4567 b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3295 {
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3296 transaction.SetGlobalProperty(property_, value_);
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 };
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 Operations operations(property, value);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3301 Apply(operations);
b812a5f2cef3 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4566 diff changeset	3302 }
4568 a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3303
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3304
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3305 void ServerIndex::DeleteAttachment(const std::string& publicId,
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3306 FileContentType type)
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3307 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3308 class Operations : public IReadWriteOperations
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3309 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3310 private:
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3311 const std::string& publicId_;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3312 FileContentType type_;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3313
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3314 public:
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3315 Operations(const std::string& publicId,
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3316 FileContentType type) :
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3317 publicId_(publicId),
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3318 type_(type)
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3319 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3320 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3321
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3322 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4568 a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3323 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3324 ResourceType rtype;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3325 int64_t id;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3326 if (!transaction.LookupResource(id, rtype, publicId_))
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3327 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3328 throw OrthancException(ErrorCode_UnknownResource);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3329 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3330 else
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3331 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3332 transaction.DeleteAttachment(id, type_);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3333
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3334 if (IsUserContentType(type_))
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3335 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3336 transaction.LogChange(id, ChangeType_UpdatedAttachment, rtype, publicId_);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3337 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3338 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3339 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3340 };
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3341
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3342 Operations operations(publicId, type);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3343 Apply(operations);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3344 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3345
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3346
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3347 void ServerIndex::LogChange(ChangeType changeType,
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3348 const std::string& publicId)
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3349 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3350 class Operations : public IReadWriteOperations
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3351 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3352 private:
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3353 ChangeType changeType_;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3354 const std::string& publicId_;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3355
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3356 public:
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3357 Operations(ChangeType changeType,
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3358 const std::string& publicId) :
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3359 changeType_(changeType),
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3360 publicId_(publicId)
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3361 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3362 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3363
4573 f6bd5563b5df simplification Sebastien Jodogne <s.jodogne@gmail.com> parents: 4572 diff changeset	3364 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
4568 a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3365 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3366 int64_t id;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3367 ResourceType type;
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3368 if (!transaction.LookupResource(id, type, publicId_))
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3369 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3370 throw OrthancException(ErrorCode_UnknownResource);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3371 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3372 else
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3373 {
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3374 transaction.LogChange(id, changeType_, type, publicId_);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3375 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3376 }
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3377 };
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 Operations operations(changeType, publicId);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3380 Apply(operations);
a3e6aa2b07b0 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4567 diff changeset	3381 }
4574 855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3382
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3383
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3384 void ServerIndex::ReconstructInstance(const ParsedDicomFile& dicom)
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3385 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3386 class Operations : public IReadWriteOperations
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3387 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3388 private:
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3389 DicomMap summary_;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3390 std::unique_ptr<DicomInstanceHasher> hasher_;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3391 bool hasTransferSyntax_;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3392 DicomTransferSyntax transferSyntax_;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3393
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3394 public:
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3395 Operations(const ParsedDicomFile& dicom)
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3396 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3397 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3398 hasher_.reset(new DicomInstanceHasher(summary_));
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3399 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3400 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3401
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3402 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3403 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3404 int64_t patient = -1, study = -1, series = -1, instance = -1;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3405
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3406 ResourceType type1, type2, type3, type4;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3407 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3408 !transaction.LookupResource(study, type2, hasher_->HashStudy()) \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3409 !transaction.LookupResource(series, type3, hasher_->HashSeries()) \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3410 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3411 type1 != ResourceType_Patient \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3412 type2 != ResourceType_Study \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3413 type3 != ResourceType_Series \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3414 type4 != ResourceType_Instance \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3415 patient == -1 \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3416 study == -1 \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3417 series == -1 \|\|
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3418 instance == -1)
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3419 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3420 throw OrthancException(ErrorCode_InternalError);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3421 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3422
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3423 transaction.ClearMainDicomTags(patient);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3424 transaction.ClearMainDicomTags(study);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3425 transaction.ClearMainDicomTags(series);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3426 transaction.ClearMainDicomTags(instance);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3427
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3428 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3429 ResourcesContent content;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3430 content.AddResource(patient, ResourceType_Patient, summary_);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3431 content.AddResource(study, ResourceType_Study, summary_);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3432 content.AddResource(series, ResourceType_Series, summary_);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3433 content.AddResource(instance, ResourceType_Instance, summary_);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3434 transaction.SetResourcesContent(content);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3435 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3436
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3437 if (hasTransferSyntax_)
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3438 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3439 transaction.SetMetadata(instance, MetadataType_Instance_TransferSyntax, GetTransferSyntaxUid(transferSyntax_));
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3440 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3441
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3442 const DicomValue* value;
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3443 if ((value = summary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3444 !value->IsNull() &&
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3445 !value->IsBinary())
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3446 {
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3447 transaction.SetMetadata(instance, MetadataType_Instance_SopClassUid, value->GetContent());
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3448 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3449 }
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3450 };
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3451
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3452 Operations operations(dicom);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3453 Apply(operations);
855e43bb293c cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 4573 diff changeset	3454 }
0 3959d33612cc initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3455 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/ServerIndex.cpp @ 4575:e23bacd4fffc db-changes