orthanc: OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp annotate

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5842:08e47734328e find-refactoring

StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata()

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 29 Oct 2024 12:46:11 +0000
parents	82fc95cc168c
children	7df3d533c294

rev	line source
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5635 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5635 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5324 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * modify it under the terms of the GNU General Public License as
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * published by the Free Software Foundation, either version 3 of the
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * License, or (at your option) any later version.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * General Public License for more details.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * You should have received a copy of the GNU General Public License
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "../PrecompiledHeadersServer.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "StatelessDatabaseOperations.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #ifndef NOMINMAX
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 #define NOMINMAX
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 #endif
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 #include "../../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 #include "../../../OrthancFramework/Sources/Logging.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "../../../OrthancFramework/Sources/OrthancException.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "../OrthancConfiguration.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include "../Search/DatabaseLookup.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include "../ServerIndexChange.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include "../ServerToolbox.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 #include "ResourcesContent.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 #include <boost/lexical_cast.hpp>
4633 37357df3dc27 fix mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	42 #include <boost/thread.hpp>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include <boost/tuple/tuple.hpp>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 #include <stack>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 namespace Orthanc
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 namespace
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	51 /**
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	52 * Some handy templates to reduce the verbosity in the definitions
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 * of the internal classes.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	54 **/
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	55
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 template <typename Operations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 typename Tuple>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 class TupleOperationsWrapper : public StatelessDatabaseOperations::IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 protected:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 Operations& operations_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62 const Tuple& tuple_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 TupleOperationsWrapper(Operations& operations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 const Tuple& tuple) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 operations_(operations),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 tuple_(tuple)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	69 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	70 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 virtual void Apply(StatelessDatabaseOperations::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 operations_.ApplyTuple(transaction, tuple_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 template <typename T1>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 class ReadOnlyOperationsT1 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 typedef typename boost::tuple<T1> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 virtual ~ReadOnlyOperationsT1()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 T1 t1)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 const Tuple tuple(t1);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 TupleOperationsWrapper<ReadOnlyOperationsT1, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	100
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	101
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 typename T2>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 class ReadOnlyOperationsT2 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107 typedef typename boost::tuple<T1, T2> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 virtual ~ReadOnlyOperationsT2()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	111 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	112
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 T2 t2)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 const Tuple tuple(t1, t2);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 TupleOperationsWrapper<ReadOnlyOperationsT2, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	123 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	124 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 typename T3>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 class ReadOnlyOperationsT3 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133 typedef typename boost::tuple<T1, T2, T3> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 virtual ~ReadOnlyOperationsT3()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	136 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	137 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	138
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 T3 t3)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 const Tuple tuple(t1, t2, t3);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 TupleOperationsWrapper<ReadOnlyOperationsT3, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	151 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	152
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	153
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 typename T4>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 class ReadOnlyOperationsT4 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161 typedef typename boost::tuple<T1, T2, T3, T4> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 virtual ~ReadOnlyOperationsT4()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	164 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	165 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 T4 t4)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 const Tuple tuple(t1, t2, t3, t4);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 TupleOperationsWrapper<ReadOnlyOperationsT4, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	179 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	180 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	181
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	182
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 typename T4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 typename T5>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 class ReadOnlyOperationsT5 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	191 typedef typename boost::tuple<T1, T2, T3, T4, T5> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 virtual ~ReadOnlyOperationsT5()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	194 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	195 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	196
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 T4 t4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 T5 t5)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 const Tuple tuple(t1, t2, t3, t4, t5);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 TupleOperationsWrapper<ReadOnlyOperationsT5, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	210 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 typename T4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 typename T5,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 typename T6>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 class ReadOnlyOperationsT6 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 typedef typename boost::tuple<T1, T2, T3, T4, T5, T6> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 virtual ~ReadOnlyOperationsT6()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 T4 t4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 T5 t5,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 T6 t6)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 const Tuple tuple(t1, t2, t3, t4, t5, t6);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 TupleOperationsWrapper<ReadOnlyOperationsT6, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	244 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	245 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 template <typename T>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 static void FormatLog(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 const std::list<T>& log,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 const std::string& name,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 bool done,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 bool hasLast,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 int64_t last)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 Json::Value items = Json::arrayValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 for (typename std::list<T>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 it = log.begin(); it != log.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 Json::Value item;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 it->Format(item);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 items.append(item);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	264 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	265
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 target = Json::objectValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 target[name] = items;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268 target["Done"] = done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 if (!hasLast)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	272 // Best-effort guess of the last index in the sequence
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 if (log.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 last = since;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 last = log.back().GetSeq();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	280 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	281 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	282
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 target["Last"] = static_cast<int>(last);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	284 if (!log.empty())
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	285 {
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	286 target["First"] = static_cast<int>(log.front().GetSeq());
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	287 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 static void CopyListToVector(std::vector<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 const std::list<std::string>& source)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 target.resize(source.size());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 size_t pos = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 it = source.begin(); it != source.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	300 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	301 target[pos] = *it;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302 pos ++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 void StatelessDatabaseOperations::ReadWriteTransaction::LogChange(int64_t internalId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 ChangeType changeType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 ServerIndexChange change(changeType, resourceType, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 if (changeType <= ChangeType_INTERNAL_LastLogged)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 {
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	316 transaction_.LogChange(changeType, resourceType, internalId, publicId, change.GetDate());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 GetTransactionContext().SignalChange(change);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 SeriesStatus StatelessDatabaseOperations::ReadOnlyTransaction::GetSeriesStatus(int64_t id,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 int64_t expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 std::list<std::string> values;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	327 transaction_.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	328
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 std::set<int64_t> instances;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 it = values.begin(); it != values.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	333 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	334 int64_t index;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338 index = boost::lexical_cast<int64_t>(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	341 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	342 return SeriesStatus_Unknown;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 if (!(index > 0 && index <= expectedNumberOfInstances))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 // Out-of-range instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 return SeriesStatus_Inconsistent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 if (instances.find(index) != instances.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 // Twice the same instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 return SeriesStatus_Inconsistent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	356
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 instances.insert(index);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 return SeriesStatus_Complete;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366 return SeriesStatus_Missing;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 class StatelessDatabaseOperations::Transaction : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 IDatabaseWrapper& db_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 std::unique_ptr<ITransactionContext> context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 bool isCommitted_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	378
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	379 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 Transaction(IDatabaseWrapper& db,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 ITransactionContextFactory& factory,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 TransactionType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 db_(db),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 isCommitted_(false)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 context_.reset(factory.Create());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 if (context_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	388 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4587 diff changeset	392 transaction_.reset(db_.StartTransaction(type, *context_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 if (transaction_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 ~Transaction()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 if (!isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 transaction_->Rollback();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	406 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	407 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408 {
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	409 LOG(INFO) << "Cannot rollback transaction: " << e.What();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	414 IDatabaseWrapper::ITransaction& GetDatabaseTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	415 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	416 assert(transaction_.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	417 return *transaction_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	418 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	419
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 void Commit()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	421 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 if (isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	423 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	424 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	425 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 int64_t delta = context_->GetCompressedSizeDelta();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430 transaction_->Commit(delta);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 context_->Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 isCommitted_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 ITransactionContext& GetContext() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 assert(context_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 return *context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 void StatelessDatabaseOperations::ApplyInternal(IReadOnlyOperations* readOperations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 IReadWriteOperations* writeOperations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 {
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	447 boost::shared_lock<boost::shared_mutex> lock(mutex_); // To protect "factory_" and "maxRetries_"
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	448
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 if ((readOperations == NULL && writeOperations == NULL) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 (readOperations != NULL && writeOperations != NULL))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 if (factory_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 throw OrthancException(ErrorCode_BadSequenceOfCalls, "No transaction context was provided");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	458 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	459
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	460 unsigned int attempt = 0;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	461
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	462 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 if (readOperations != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 /**
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 * IMPORTANT: In Orthanc <= 1.9.1, there was no transaction
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 * in this case. This was OK because of the presence of the
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	471 * global mutex that was protecting the database.
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	472 **/
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	473
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 Transaction transaction(db_, *factory_, TransactionType_ReadOnly); // TODO - Only if not "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	476 ReadOnlyTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 readOperations->Apply(t);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 assert(writeOperations != NULL);
5783 56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	484 if (readOnly_)
56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	485 {
56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	486 throw OrthancException(ErrorCode_ReadOnly, "The DB is trying to execute a ReadWrite transaction while Orthanc has been started in ReadOnly mode.");
56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	487 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 Transaction transaction(db_, *factory_, TransactionType_ReadWrite);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	491 ReadWriteTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 writeOperations->Apply(t);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 return; // Success
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	498 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	499 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 {
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	503 if (attempt >= maxRetries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504 {
5492 26877f4b306f now only logging 'Maximum transactions retries reached' as an error Alain Mazy <am@osimis.io> parents: 5466 diff changeset	505 LOG(ERROR) << "Maximum transactions retries reached " << e.GetDetails();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 {
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	510 attempt++;
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	511
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	512 // The "rand()" adds some jitter to de-synchronize writers
4619 fda80844b920 separate db retries by 100ms instead of 50ms to simplify documentation Sebastien Jodogne <s.jodogne@gmail.com> parents: 4613 diff changeset	513 boost::this_thread::sleep(boost::posix_time::milliseconds(100 * attempt + 5 * (rand() % 10)));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524
5783 56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	525 StatelessDatabaseOperations::StatelessDatabaseOperations(IDatabaseWrapper& db, bool readOnly) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526 db_(db),
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	527 mainDicomTagsRegistry_(new MainDicomTagsRegistry),
5783 56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	528 maxRetries_(0),
56352ae88120 wip: new ReadOnly configuration Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	529 readOnly_(readOnly)
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	530 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	531 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	532
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	533
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	534 void StatelessDatabaseOperations::FlushToDisk()
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	536 try
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	537 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	538 db_.FlushToDisk();
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	539 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	540 catch (OrthancException&)
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	541 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	542 LOG(ERROR) << "Cannot flush the SQLite database to the disk (is your filesystem full?)";
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	543 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 void StatelessDatabaseOperations::SetTransactionContextFactory(ITransactionContextFactory* factory)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 {
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	549 boost::unique_lock<boost::shared_mutex> lock(mutex_);
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	550
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 if (factory == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 else if (factory_.get() != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 factory_.reset(factory);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565
4613 2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	566 void StatelessDatabaseOperations::SetMaxDatabaseRetries(unsigned int maxRetries)
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	567 {
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	568 boost::unique_lock<boost::shared_mutex> lock(mutex_);
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	569 maxRetries_ = maxRetries;
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	570 }
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	571
2684544ff03c maximum number of database retries for writer collisions is now set by the plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 4612 diff changeset	572
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 void StatelessDatabaseOperations::Apply(IReadOnlyOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 ApplyInternal(&operations, NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 void StatelessDatabaseOperations::Apply(IReadWriteOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 ApplyInternal(NULL, &operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	582 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	585 bool StatelessDatabaseOperations::ExpandResource(ExpandedResource& target,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 const std::string& publicId,
4697 569d9ef165b1 Added "short", "simplify" and/or "full" options to control the format of DICOM tags wherever possible Sebastien Jodogne <s.jodogne@gmail.com> parents: 4694 diff changeset	587 ResourceType level,
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	588 const std::set<DicomTag>& requestedTags,
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	589 ExpandResourceFlags expandFlags)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	591 class Operations : public ReadOnlyOperationsT6<
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	592 bool&, ExpandedResource&, const std::string&, ResourceType, const std::set<DicomTag>&, ExpandResourceFlags>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 private:
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	595 bool hasLabelsSupport_;
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	596
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 static bool LookupStringMetadata(std::string& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 std::map<MetadataType, std::string>::const_iterator found = metadata.find(type);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	602
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 if (found == metadata.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609 result = found->second;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 static bool LookupIntegerMetadata(int64_t& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 std::string s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 if (!LookupStringMetadata(s, metadata, type))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	626 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627 result = boost::lexical_cast<int64_t>(s);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 public:
5526 9a431368801b cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 5523 diff changeset	638 explicit Operations(bool hasLabelsSupport) :
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	639 hasLabelsSupport_(hasLabelsSupport)
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	640 {
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	641 }
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	642
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 // Lookup for the requested resource
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	647 int64_t internalId;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 std::string parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	653 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 {
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	657 ExpandedResource& target = tuple.get<1>();
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	658 ExpandResourceFlags expandFlags = tuple.get<5>();
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	659
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 // Set information about the parent resource (if it exists)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661 if (type == ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 if (!parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	667 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 if (parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	672 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	675 target.parentId_ = parent;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	676 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	678 target.SetResource(type, tuple.get<2>());
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	679
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	680 if (expandFlags & ExpandResourceFlags_IncludeChildren)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	682 // List the children resources
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	683 transaction.GetChildrenPublicId(target.childrenIds_, internalId);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	684 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	685
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	686 if (expandFlags & ExpandResourceFlags_IncludeMetadata)
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	687 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	688 // Extract the metadata
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	689 transaction.GetAllMetadata(target.metadata_, internalId);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	690
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	691 switch (type)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	693 case ResourceType_Patient:
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	694 case ResourceType_Study:
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	695 break;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	696
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	697 case ResourceType_Series:
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	698 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	699 int64_t i;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	700 if (LookupIntegerMetadata(i, target.metadata_, MetadataType_Series_ExpectedNumberOfInstances))
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	701 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	702 target.expectedNumberOfInstances_ = static_cast<int>(i);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	703 target.status_ = EnumerationToString(transaction.GetSeriesStatus(internalId, i));
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	704 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	705 else
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	706 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	707 target.expectedNumberOfInstances_ = -1;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	708 target.status_ = EnumerationToString(SeriesStatus_Unknown);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	709 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	710
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	711 break;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	714 case ResourceType_Instance:
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	715 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	716 FileInfo attachment;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	717 int64_t revision; // ignored
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	718 if (!transaction.LookupAttachment(attachment, revision, internalId, FileContentType_Dicom))
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	719 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	720 throw OrthancException(ErrorCode_InternalError);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	721 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	722
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	723 target.fileSize_ = static_cast<unsigned int>(attachment.GetUncompressedSize());
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	724 target.fileUuid_ = attachment.GetUuid();
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	725
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	726 int64_t i;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	727 if (LookupIntegerMetadata(i, target.metadata_, MetadataType_Instance_IndexInSeries))
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	728 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	729 target.indexInSeries_ = static_cast<int>(i);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	730 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	731 else
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	732 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	733 target.indexInSeries_ = -1;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	734 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	735
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	736 break;
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	737 }
8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	738
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	739 default:
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	740 throw OrthancException(ErrorCode_InternalError);
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	741 }
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	742
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	743 // check the main dicom tags list has not changed since the resource was stored
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5783 diff changeset	744 target.mainDicomTagsSignature_ = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(type);
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	745 LookupStringMetadata(target.mainDicomTagsSignature_, target.metadata_, MetadataType_MainDicomTagsSignature);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	746 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	747
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	748 if (expandFlags & ExpandResourceFlags_IncludeMainDicomTags)
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	749 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	750 // read all tags from DB
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	751 transaction.GetMainDicomTags(target.GetMainDicomTags(), internalId);
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	752
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	753 // read all main sequences from DB
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	754 std::string serializedSequences;
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	755 if (LookupStringMetadata(serializedSequences, target.metadata_, MetadataType_MainDicomSequences))
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	756 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	757 Json::Value jsonMetadata;
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	758 Toolbox::ReadJson(jsonMetadata, serializedSequences);
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	759
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	760 assert(jsonMetadata["Version"].asInt() == 1);
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	761 target.GetMainDicomTags().FromDicomAsJson(jsonMetadata["Sequences"], true /* append /, true / parseSequences */);
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	762 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	763
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	764 // check if we have access to all requestedTags or if we must get tags from parents
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	765 const std::set<DicomTag>& requestedTags = tuple.get<4>();
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	766
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	767 if (requestedTags.size() > 0)
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	768 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	769 std::set<DicomTag> savedMainDicomTags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	770
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	771 FromDcmtkBridge::ParseListOfTags(savedMainDicomTags, target.mainDicomTagsSignature_);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	772
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	773 // read parent main dicom tags as long as we have not gathered all requested tags
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	774 ResourceType currentLevel = target.GetLevel();
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	775 int64_t currentInternalId = internalId;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	776 Toolbox::GetMissingsFromSet(target.missingRequestedTags_, requestedTags, savedMainDicomTags);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	777
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	778 while ((target.missingRequestedTags_.size() > 0)
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	779 && currentLevel != ResourceType_Patient)
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	780 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	781 currentLevel = GetParentResourceType(currentLevel);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	782
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	783 int64_t currentParentId;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	784 if (!transaction.LookupParent(currentParentId, currentInternalId))
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	785 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	786 break;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	787 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	788
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	789 std::map<MetadataType, std::string> parentMetadata;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	790 transaction.GetAllMetadata(parentMetadata, currentParentId);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	791
5795 9990b4140c1c fix unit tests Alain Mazy <am@orthanc.team> parents: 5783 diff changeset	792 std::string parentMainDicomTagsSignature = DicomMap::GetDefaultMainDicomTagsSignatureFrom1_11(currentLevel);
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	793 LookupStringMetadata(parentMainDicomTagsSignature, parentMetadata, MetadataType_MainDicomTagsSignature);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	794
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	795 std::set<DicomTag> parentSavedMainDicomTags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	796 FromDcmtkBridge::ParseListOfTags(parentSavedMainDicomTags, parentMainDicomTagsSignature);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	797
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	798 size_t previousMissingCount = target.missingRequestedTags_.size();
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	799 Toolbox::AppendSets(savedMainDicomTags, parentSavedMainDicomTags);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	800 Toolbox::GetMissingsFromSet(target.missingRequestedTags_, requestedTags, savedMainDicomTags);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	801
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	802 // read the parent tags from DB only if it reduces the number of missing tags
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	803 if (target.missingRequestedTags_.size() < previousMissingCount)
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	804 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	805 Toolbox::AppendSets(savedMainDicomTags, parentSavedMainDicomTags);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	806
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	807 DicomMap parentTags;
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	808 transaction.GetMainDicomTags(parentTags, currentParentId);
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	809
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	810 target.GetMainDicomTags().Merge(parentTags);
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	811 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	812
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	813 currentInternalId = currentParentId;
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	814 }
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	815 }
4936 8422e4f99a18 Handling RequestedTags in ExpandResource -> read parent main dicom tags if required. Not yet getting missing tags from file. Integration tests ok Alain Mazy <am@osimis.io> parents: 4935 diff changeset	816 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	818 if ((expandFlags & ExpandResourceFlags_IncludeLabels) &&
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	819 hasLabelsSupport_)
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	820 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	821 transaction.ListLabels(target.labels_, internalId);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	822 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	823
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824 std::string tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	826 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_AnonymizedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 {
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	828 target.anonymizedFrom_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	831 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_ModifiedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 {
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	833 target.modifiedFrom_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836 if (type == ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 type == ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838 type == ResourceType_Series)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 {
5603 b2a97dfd719f monitoring of stable resources now also considers the resource type Sebastien Jodogne <s.jodogne@gmail.com> parents: 5558 diff changeset	840 target.isStable_ = !transaction.GetTransactionContext().IsUnstableResource(type, internalId);
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	841
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	842 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_LastUpdate))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843 {
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	844 target.lastUpdate_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	845 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	846 }
4935 acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	847 else
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	848 {
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	849 target.isStable_ = false;
acd3f72e2a21 split ExpandResource in 2: read from DB and serialize to json. This will allow us to merge requested tags from both the DB and the file system Alain Mazy <am@osimis.io> parents: 4934 diff changeset	850 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	851
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	854 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	855 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	856
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	857 bool found;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	858 Operations operations(db_.GetDatabaseCapabilities().HasLabelsSupport());
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	859 operations.Apply(*this, found, target, publicId, level, requestedTags, expandFlags);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	860 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	861 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	862
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	863
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	864 void StatelessDatabaseOperations::GetAllMetadata(std::map<MetadataType, std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	865 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	866 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 {
5842 08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	868 FindRequest request(level);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	869 request.SetOrthancId(level, publicId);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	870 request.SetRetrieveMetadata(true);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	871
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	872 FindResponse response;
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	873 ExecuteFind(response, request);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	874
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	875 if (response.GetSize() == 0)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	876 {
5842 08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	877 throw OrthancException(ErrorCode_UnknownResource);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	878 }
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	879 else if (response.GetSize() == 1)
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	880 {
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	881 target = response.GetResourceByIndex(0).GetMetadata(level);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	882 }
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	883 else
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	884 {
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	885 throw OrthancException(ErrorCode_DatabasePlugin);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	886 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	887 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	888
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	889
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	890 bool StatelessDatabaseOperations::LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	891 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	892 const std::string& instancePublicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	893 FileContentType contentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	894 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	895 class Operations : public ReadOnlyOperationsT5<bool&, FileInfo&, int64_t&, const std::string&, FileContentType>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	896 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	897 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	898 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	899 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	901 int64_t internalId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	902 ResourceType type;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	903 if (!transaction.LookupResource(internalId, type, tuple.get<3>()))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	904 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	905 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	906 }
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	907 else if (transaction.LookupAttachment(tuple.get<1>(), tuple.get<2>(), internalId, tuple.get<4>()))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	908 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	909 assert(tuple.get<1>().GetContentType() == tuple.get<4>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	910 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	911 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	912 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	913 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	914 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	915 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	917 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	918
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	919 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	920 Operations operations;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	921 operations.Apply(*this, found, attachment, revision, instancePublicId, contentType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	922 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	923 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	924
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	925
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	926 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	927 ResourceType resourceType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	928 {
5842 08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	929 // This method is tested by "orthanc-tests/Plugins/WebDav/Run.py"
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	930 FindRequest request(resourceType);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	931
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	932 FindResponse response;
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	933 ExecuteFind(response, request);
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	934
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	935 target.clear();
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	936 for (size_t i = 0; i < response.GetSize(); i++)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	937 {
5842 08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	938 target.push_back(response.GetResourceByIndex(i).GetIdentifier());
08e47734328e StatelessDatabaseOperations: reimplementing GetAllUuids() and GetAllMetadata() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5837 diff changeset	939 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	941
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	942
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	943 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	944 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	945 size_t since,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	946 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 if (limit == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	951 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 class Operations : public ReadOnlyOperationsT4<std::list<std::string>&, ResourceType, size_t, size_t>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	956 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	963 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	964
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	965 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 operations.Apply(*this, target, resourceType, since, limit);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	970
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	971 void StatelessDatabaseOperations::GetGlobalStatistics(/* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	972 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 /* out */ uint64_t& countPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974 /* out */ uint64_t& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975 /* out */ uint64_t& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 /* out */ uint64_t& countInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 {
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	978 // Code introduced in Orthanc 1.12.3 that updates and gets all statistics.
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	979 // I.e, PostgreSQL now store "changes" to apply to the statistics to prevent row locking
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	980 // of the GlobalIntegers table while multiple clients are inserting/deleting new resources.
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	981 // Then, the statistics are updated when requested to make sure they are correct.
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	982 class Operations : public IReadWriteOperations
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	983 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	984 private:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	985 int64_t diskSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	986 int64_t uncompressedSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	987 int64_t countPatients_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	988 int64_t countStudies_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	989 int64_t countSeries_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	990 int64_t countInstances_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	991
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	992 public:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	993 Operations() :
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	994 diskSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	995 uncompressedSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	996 countPatients_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	997 countStudies_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	998 countSeries_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	999 countInstances_(0)
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1000 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1001 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1002
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1003 void GetValues(uint64_t& diskSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1004 uint64_t& uncompressedSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1005 uint64_t& countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1006 uint64_t& countStudies,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1007 uint64_t& countSeries,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1008 uint64_t& countInstances) const
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1009 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1010 diskSize = static_cast<uint64_t>(diskSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1011 uncompressedSize = static_cast<uint64_t>(uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1012 countPatients = static_cast<uint64_t>(countPatients_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1013 countStudies = static_cast<uint64_t>(countStudies_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1014 countSeries = static_cast<uint64_t>(countSeries_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1015 countInstances = static_cast<uint64_t>(countInstances_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1016 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1017
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1018 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1019 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1020 transaction.UpdateAndGetStatistics(countPatients_, countStudies_, countSeries_, countInstances_, diskSize_, uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1021 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1022 };
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1023
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	1024 // Compatibility with Orthanc SDK <= 1.12.2 that reads each entry individualy
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1025 class LegacyOperations : public ReadOnlyOperationsT6<uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 tuple.get<0>() = transaction.GetTotalCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 tuple.get<1>() = transaction.GetTotalUncompressedSize();
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1033 tuple.get<2>() = transaction.GetResourcesCount(ResourceType_Patient);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1034 tuple.get<3>() = transaction.GetResourcesCount(ResourceType_Study);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1035 tuple.get<4>() = transaction.GetResourcesCount(ResourceType_Series);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1036 tuple.get<5>() = transaction.GetResourcesCount(ResourceType_Instance);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 };
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1039
5817 272b0d0eef38 ReadOnly mode continued Alain Mazy <am@orthanc.team> parents: 5804 diff changeset	1040 if (GetDatabaseCapabilities().HasUpdateAndGetStatistics() && !IsReadOnly())
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1041 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1042 Operations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1043 Apply(operations);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1044
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1045 operations.GetValues(diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1046 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1047 else
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1048 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1049 LegacyOperations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1050 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1051 countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1052 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1056 void StatelessDatabaseOperations::GetChanges(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1064 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 // "GetLastChange()" involves calls to "GetPublicId()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 transaction.GetChanges(changes, done, tuple.get<1>(), tuple.get<2>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1076 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1077 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1078 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 FormatLog(tuple.get<0>(), changes, "Changes", done, tuple.get<1>(), hasLast, last);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1083 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1090 void StatelessDatabaseOperations::GetChangesExtended(Json::Value& target,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1091 int64_t since,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1092 int64_t to,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1093 unsigned int maxResults,
5804 25df40a274fd /changes: allowing filtering on multiple changes Alain Mazy <am@orthanc.team> parents: 5795 diff changeset	1094 const std::set<ChangeType>& changeType)
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1095 {
5804 25df40a274fd /changes: allowing filtering on multiple changes Alain Mazy <am@orthanc.team> parents: 5795 diff changeset	1096 class Operations : public ReadOnlyOperationsT5<Json::Value&, int64_t, int64_t, unsigned int, const std::set<ChangeType>&>
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1097 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1098 public:
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1099 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1100 const Tuple& tuple) ORTHANC_OVERRIDE
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1101 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1102 std::list<ServerIndexChange> changes;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1103 bool done;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1104 bool hasLast = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1105 int64_t last = 0;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1106
5804 25df40a274fd /changes: allowing filtering on multiple changes Alain Mazy <am@orthanc.team> parents: 5795 diff changeset	1107 transaction.GetChangesExtended(changes, done, tuple.get<1>(), tuple.get<2>(), tuple.get<3>(), tuple.get<4>());
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1108 if (changes.empty())
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1109 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1110 last = transaction.GetLastChangeIndex();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1111 hasLast = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1112 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1113
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1114 FormatLog(tuple.get<0>(), changes, "Changes", done, tuple.get<1>(), hasLast, last);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1115 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1116 };
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1117
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1118 Operations operations;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1119 operations.Apply(*this, target, since, to, maxResults, changeType);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1120 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1121
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1122
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 void StatelessDatabaseOperations::GetLastChange(Json::Value& target)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125 class Operations : public ReadOnlyOperationsT1<Json::Value&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1129 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1130 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1131 // NB: In Orthanc <= 1.3.2, a transaction was missing, as
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1132 // "GetLastChange()" involves calls to "GetPublicId()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1134 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1135 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1136 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1137
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1138 transaction.GetLastChange(changes);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1139 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1140 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1141 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1142 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1143 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1144
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 FormatLog(tuple.get<0>(), changes, "Changes", true, 0, hasLast, last);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1146 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1147 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1148
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1149 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1150 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1151 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1152
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1153
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1154 void StatelessDatabaseOperations::GetExportedResources(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1155 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1156 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1157 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1158 class Operations : public ReadOnlyOperationsT3<Json::Value&, int64_t, unsigned int>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1159 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1160 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1161 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 transaction.GetExportedResources(exported, done, tuple.get<1>(), tuple.get<2>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 FormatLog(tuple.get<0>(), exported, "Exports", done, tuple.get<1>(), false, -1);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1170 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1174 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1175 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178 void StatelessDatabaseOperations::GetLastExportedResource(Json::Value& target)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 class Operations : public ReadOnlyOperationsT1<Json::Value&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1181 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1182 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1183 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1184 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1185 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1186 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1187
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1189 transaction.GetLastExportedResource(exported);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1190 FormatLog(tuple.get<0>(), exported, "Exports", true, 0, false, -1);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1191 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1197
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199 bool StatelessDatabaseOperations::IsProtectedPatient(const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1201 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1202 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1204 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1205 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1206 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1207 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1208 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1209 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1210 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1211 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1213 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1214 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1215 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1216 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1217 tuple.get<0>() = transaction.IsProtectedPatient(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1218 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222 bool isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1223 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1224 operations.Apply(*this, isProtected, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1225 return isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1226 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1227
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1229 void StatelessDatabaseOperations::GetChildren(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1230 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1231 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1232 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1233 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1234 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1235 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1238 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1239 int64_t resource;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1240 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1241 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244 else if (type == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 // An instance cannot have a child
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1247 throw OrthancException(ErrorCode_BadParameterType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1250 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259 tuple.get<0>().push_back(transaction.GetPublicId(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1262 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1265 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1266 operations.Apply(*this, result, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1267 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1268
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 void StatelessDatabaseOperations::GetChildInstances(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1275 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1276 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1278 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1279 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1280
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1281 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1282 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1283 if (!transaction.LookupResource(top, type, tuple.get<1>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1284 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1285 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1286 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1287 else if (type == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1288 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1289 // The resource is already an instance: Do not go down the hierarchy
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1290 tuple.get<0>().push_back(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1291 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1292 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1293 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1294 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1295 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1296
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1297 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1298 while (!toExplore.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1299 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1300 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1301 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1302 toExplore.pop();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1304 // TODO - This could be optimized by seeing how many
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1305 // levels "type == transaction.GetResourceType(top)" is
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1306 // above the "instances level"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1307 if (transaction.GetResourceType(resource) == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1308 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1309 tuple.get<0>().push_back(transaction.GetPublicId(resource));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1310 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1311 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1312 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1313 // Tag all the children of this resource as to be explored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1316 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1317 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1318 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1319 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1322 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1323 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1324 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1326 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1327 operations.Apply(*this, result, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1328 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1329
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1330
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1331 bool StatelessDatabaseOperations::LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1332 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1333 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1334 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1335 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1336 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1337 class Operations : public ReadOnlyOperationsT6<bool&, std::string&, int64_t&,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1338 const std::string&, ResourceType, MetadataType>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1341 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1342 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1344 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1346 if (!transaction.LookupResource(id, resourceType, tuple.get<3>()) \|\|
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1347 resourceType != tuple.get<4>())
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1352 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1353 tuple.get<0>() = transaction.LookupMetadata(tuple.get<1>(), tuple.get<2>(), id, tuple.get<5>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1354 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1355 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1356 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1357
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1358 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1359 Operations operations;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1360 operations.Apply(*this, found, target, revision, publicId, expectedType, type);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1361 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1362 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1363
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1364
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1365 void StatelessDatabaseOperations::ListAvailableAttachments(std::set<FileContentType>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1366 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1367 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1368 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1369 class Operations : public ReadOnlyOperationsT3<std::set<FileContentType>&, const std::string&, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1370 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1375 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1376 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 tuple.get<2>() != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1380 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1382 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1383 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1384 transaction.ListAvailableAttachments(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1385 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1386 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1387 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1388
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1389 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1390 operations.Apply(*this, target, publicId, expectedType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1391 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1392
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1393
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1394 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1395 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1396 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1397 class Operations : public ReadOnlyOperationsT3<bool&, std::string&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1398 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1399 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1400 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1401 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1402 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1403 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1404 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1405 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1406 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1407 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1408 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1409 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1410 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1411 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1412 if (transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1413 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1414 tuple.get<1>() = transaction.GetPublicId(parentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1415 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1416 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1417 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1418 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1419 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1420 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1421 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1422 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1423 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1424
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1425 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1426 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1427 operations.Apply(*this, found, target, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1428 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1429 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1430
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1431
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1432 void StatelessDatabaseOperations::GetResourceStatistics(/* out */ ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1433 /* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1434 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1435 /* out */ unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1436 /* out */ unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1437 /* out */ unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1438 /* out */ uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1439 /* out */ uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1440 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1441 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1442 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1443 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1444 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1445 ResourceType& type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1446 uint64_t& diskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1447 uint64_t& uncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1448 unsigned int& countStudies_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1449 unsigned int& countSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1450 unsigned int& countInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1451 uint64_t& dicomDiskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1452 uint64_t& dicomUncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1453 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1454
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1455 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1456 explicit Operations(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1457 uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1458 uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1459 unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1460 unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1461 unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1462 uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1463 uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1464 const std::string& publicId) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1465 type_(type),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1466 diskSize_(diskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1467 uncompressedSize_(uncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1468 countStudies_(countStudies),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1469 countSeries_(countSeries),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1470 countInstances_(countInstances),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1471 dicomDiskSize_(dicomDiskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1472 dicomUncompressedSize_(dicomUncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1473 publicId_(publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1474 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1475 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1476
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1477 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1478 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1479 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1480 if (!transaction.LookupResource(top, type_, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1481 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1482 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1483 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1484 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1485 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1486 countInstances_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1487 countSeries_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1488 countStudies_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1489 diskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1490 uncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1491 dicomDiskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1492 dicomUncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1493
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1494 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1495 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1496
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1497 while (!toExplore.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1498 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1499 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1500 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1501 toExplore.pop();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1502
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1503 ResourceType thisType = transaction.GetResourceType(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1504
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1505 std::set<FileContentType> f;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1506 transaction.ListAvailableAttachments(f, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1507
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1508 for (std::set<FileContentType>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1509 it = f.begin(); it != f.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1510 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1511 FileInfo attachment;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1512 int64_t revision; // ignored
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1513 if (transaction.LookupAttachment(attachment, revision, resource, *it))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1514 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1515 if (attachment.GetContentType() == FileContentType_Dicom)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1516 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1517 dicomDiskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 dicomUncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1521 diskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1522 uncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1523 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1524 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1525
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1526 if (thisType == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1527 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1528 countInstances_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1529 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1530 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1531 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1532 switch (thisType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1533 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1534 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1535 countStudies_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1536 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1537
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1538 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1539 countSeries_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1540 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1541
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1542 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1543 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1544 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1545
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1546 // Tag all the children of this resource as to be explored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1547 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1548 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1549 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1550 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1551 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1552 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1553 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1554 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1555 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1556
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1557 if (countStudies_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1558 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1559 countStudies_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1560 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1561
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1562 if (countSeries_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1563 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1564 countSeries_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1565 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1566 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1567 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1568 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1569
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1570 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1571 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1572 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1573 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1575
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1576 void StatelessDatabaseOperations::LookupIdentifierExact(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1577 ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1578 const DicomTag& tag,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1579 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1580 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1581 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1582 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1583 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1584 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1585 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1586
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1587 result.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1588
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1589 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1590
5828 7030fa489669 tools/find: QueryMetadata Alain Mazy <am@orthanc.team> parents: 5819 diff changeset	1591 DatabaseDicomTagConstraints query;
5693 023787ecaff2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 5681 diff changeset	1592 bool isIdentical; // unused
023787ecaff2 cont Sebastien Jodogne <s.jodogne@gmail.com> parents: 5681 diff changeset	1593 query.AddConstraint(c.ConvertToDatabaseConstraint(isIdentical, level, DicomTagType_Identifier));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1594
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1595
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1596 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1597 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1598 private:
5680 68fc5af30c03 added container class DatabaseConstraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 5678 diff changeset	1599 std::vector<std::string>& result_;
5828 7030fa489669 tools/find: QueryMetadata Alain Mazy <am@orthanc.team> parents: 5819 diff changeset	1600 const DatabaseDicomTagConstraints& query_;
5680 68fc5af30c03 added container class DatabaseConstraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 5678 diff changeset	1601 ResourceType level_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1602
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1603 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1604 Operations(std::vector<std::string>& result,
5828 7030fa489669 tools/find: QueryMetadata Alain Mazy <am@orthanc.team> parents: 5819 diff changeset	1605 const DatabaseDicomTagConstraints& query,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 ResourceType level) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607 result_(result),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1608 query_(query),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1609 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1610 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1611 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1612
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1615 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1616 std::list<std::string> tmp;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1617 std::set<std::string> labels;
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1618 transaction.ApplyLookupResources(tmp, NULL, query_, level_, labels, LabelsConstraint_Any, 0);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1619 CopyListToVector(result_, tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1620 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1621 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1622
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1623 Operations operations(result, query, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1624 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1625 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1626
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1627
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1628 bool StatelessDatabaseOperations::LookupGlobalProperty(std::string& value,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1629 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1630 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1631 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1632 class Operations : public ReadOnlyOperationsT4<bool&, std::string&, GlobalProperty, bool>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1633 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1634 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1635 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1636 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1637 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1638 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1639 tuple.get<0>() = transaction.LookupGlobalProperty(tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1640 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1641 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1642
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1643 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1644 Operations operations;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1645 operations.Apply(*this, found, value, property, shared);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1646 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1647 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1648
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1649
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1650 std::string StatelessDatabaseOperations::GetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1651 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1652 const std::string& defaultValue)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1653 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1654 std::string s;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1655 if (LookupGlobalProperty(s, property, shared))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1656 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1657 return s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1658 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1659 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1660 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1661 return defaultValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1662 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1663 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1664
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1665
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1666 bool StatelessDatabaseOperations::GetMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1667 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1668 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1669 ResourceType levelOfInterest)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1670 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1671 // Yes, the following test could be shortened, but we wish to make it as clear as possible
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1672 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1673 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1674 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1675 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1676 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1677 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1678 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1679 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1680
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1681
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1682 class Operations : public ReadOnlyOperationsT5<bool&, DicomMap&, const std::string&, ResourceType, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1683 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1684 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1685 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1686 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1687 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1688 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1689 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1690 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1691 if (!transaction.LookupResource(id, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1692 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1693 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1694 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1695 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1696 else if (type == ResourceType_Study)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1697 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1698 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1699 transaction.GetMainDicomTags(tmp, id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1700
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1701 switch (tuple.get<4>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1702 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1703 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1704 tmp.ExtractPatientInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1705 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1706 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1707
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1708 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1709 tmp.ExtractStudyInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1710 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1711 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1712
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1713 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1714 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1715 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1716 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1717 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1718 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1719 transaction.GetMainDicomTags(tuple.get<1>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1720 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1721 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1722 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1723 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1724
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1725 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1726
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1727 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1728 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1729 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1730 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1731 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1732
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1733
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1734 bool StatelessDatabaseOperations::GetAllMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1735 const std::string& instancePublicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1736 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1737 class Operations : public ReadOnlyOperationsT3<bool&, DicomMap&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1738 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1739 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1740 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1741 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1742 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1743 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1744 int64_t instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1745 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1746 if (!transaction.LookupResource(instance, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1747 type != ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1748 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1749 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1750 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1751 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1752 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1753 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1754
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1755 transaction.GetMainDicomTags(tmp, instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1756 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1757
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1758 int64_t series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1759 if (!transaction.LookupParent(series, instance))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1760 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1761 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1762 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1763
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1764 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1765 transaction.GetMainDicomTags(tmp, series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1766 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1767
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1768 int64_t study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1769 if (!transaction.LookupParent(study, series))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1770 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1771 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1772 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1773
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1774 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1775 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1776 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1777
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778 #ifndef NDEBUG
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1779 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1780 // Sanity test to check that all the main DICOM tags from the
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781 // patient level are copied at the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1782
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1783 int64_t patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1784 if (!transaction.LookupParent(patient, study))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1785 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1786 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1787 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1788
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1789 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1790 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1791
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1792 std::set<DicomTag> patientTags;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1793 tmp.GetTags(patientTags);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1794
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1795 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1796 it = patientTags.begin(); it != patientTags.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1797 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1798 assert(tuple.get<1>().HasTag(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1799 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1800 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1801 #endif
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1802
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1803 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1804 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1805 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1806 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1807
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1808 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1809
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1810 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1811 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1812 operations.Apply(*this, found, result, instancePublicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1813 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1814 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1815
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1816
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1817 bool StatelessDatabaseOperations::LookupResourceType(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1818 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1819 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1820 class Operations : public ReadOnlyOperationsT3<bool&, ResourceType&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1821 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1822 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1823 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1824 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1825 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1826 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1827 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1828 tuple.get<0>() = transaction.LookupResource(id, tuple.get<1>(), tuple.get<2>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1829 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1830 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1831
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1832 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1833 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1834 operations.Apply(*this, found, type, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1835 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1836 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1837
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1838
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1839 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1840 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1841 ResourceType parentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1842 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 class Operations : public ReadOnlyOperationsT4<bool&, std::string&, const std::string&, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1844 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1845 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1846 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1847 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1848 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1849 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1850 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1851 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1852 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1853 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1854 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1855
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1856 while (type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1857 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1858 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1859
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1860 if (type == ResourceType_Patient \|\| // Cannot further go up in hierarchy
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 !transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1862 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1863 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1864 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1865 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1866
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1867 id = parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1868 type = GetParentResourceType(type);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1869 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1870
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1871 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1872 tuple.get<1>() = transaction.GetPublicId(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1873 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1874 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1875
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1876 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1877 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1878 operations.Apply(*this, found, target, publicId, parentType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1879 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1880 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1881
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1882
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1883 void StatelessDatabaseOperations::ApplyLookupResources(std::vector<std::string>& resourcesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1884 std::vector<std::string>* instancesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1885 const DatabaseLookup& lookup,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1886 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1887 const std::set<std::string>& labels,
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1888 LabelsConstraint labelsConstraint,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1889 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1890 {
5828 7030fa489669 tools/find: QueryMetadata Alain Mazy <am@orthanc.team> parents: 5819 diff changeset	1891 class Operations : public ReadOnlyOperationsT6<bool, const DatabaseDicomTagConstraints&, ResourceType,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1892 const std::set<std::string>&, LabelsConstraint, size_t>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1893 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1894 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1895 std::list<std::string> resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1896 std::list<std::string> instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1897
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1898 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1899 const std::list<std::string>& GetResourcesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1900 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1901 return resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1902 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1903
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1904 const std::list<std::string>& GetInstancesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1905 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1906 return instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1907 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1908
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1909 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1910 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1911 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1912 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1913 if (tuple.get<0>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1914 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1915 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1916 resourcesList_, &instancesList_, tuple.get<1>(), tuple.get<2>(), tuple.get<3>(), tuple.get<4>(), tuple.get<5>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1917 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1918 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1919 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1920 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1921 resourcesList_, NULL, tuple.get<1>(), tuple.get<2>(), tuple.get<3>(), tuple.get<4>(), tuple.get<5>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1922 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1923 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1924 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1925
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1926 if (!labels.empty() &&
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	1927 !db_.GetDatabaseCapabilities().HasLabelsSupport())
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1928 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1929 throw OrthancException(ErrorCode_NotImplemented, "The database backend doesn't support labels");
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1930 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1931
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1932 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1933 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1934 ServerToolbox::CheckValidLabel(*it);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1935 }
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	1936
5828 7030fa489669 tools/find: QueryMetadata Alain Mazy <am@orthanc.team> parents: 5819 diff changeset	1937 DatabaseDicomTagConstraints normalized;
5678 e47ac5e133b1 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	1938
e47ac5e133b1 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	1939 assert(mainDicomTagsRegistry_.get() != NULL);
e47ac5e133b1 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	1940 mainDicomTagsRegistry_->NormalizeLookup(normalized, lookup, queryLevel);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1941
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1942 Operations operations;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1943 operations.Apply(*this, (instancesId != NULL), normalized, queryLevel, labels, labelsConstraint, limit);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1944
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1945 CopyListToVector(resourcesId, operations.GetResourcesList());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1946
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1947 if (instancesId != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1948 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1949 CopyListToVector(*instancesId, operations.GetInstancesList());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1950 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1951 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1952
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1953
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1954 bool StatelessDatabaseOperations::DeleteResource(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1955 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1956 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1957 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1958 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1959 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1960 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1961 bool found_;
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1962 Json::Value& remainingAncestor_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1963 const std::string& uuid_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1964 ResourceType expectedType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1965
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1966 public:
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1967 Operations(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1968 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1969 ResourceType expectedType) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1970 found_(false),
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	1971 remainingAncestor_(remainingAncestor),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1972 uuid_(uuid),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1973 expectedType_(expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1974 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1975 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1976
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1977 bool IsFound() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1978 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1979 return found_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1980 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1981
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1982 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1983 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1984 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1985 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1986 if (!transaction.LookupResource(id, type, uuid_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1987 expectedType_ != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1988 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1989 found_ = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1991 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1993 found_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1994 transaction.DeleteResource(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1995
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1996 std::string remainingPublicId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1997 ResourceType remainingLevel;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1998 if (transaction.GetTransactionContext().LookupRemainingLevel(remainingPublicId, remainingLevel))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1999 {
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2000 remainingAncestor_["RemainingAncestor"] = Json::Value(Json::objectValue);
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2001 remainingAncestor_["RemainingAncestor"]["Path"] = GetBasePath(remainingLevel, remainingPublicId);
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2002 remainingAncestor_["RemainingAncestor"]["Type"] = EnumerationToString(remainingLevel);
da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2003 remainingAncestor_["RemainingAncestor"]["ID"] = remainingPublicId;
5297 c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2004
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2005 { // update the LastUpdate metadata of all parents
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2006 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2007 ResourcesContent content(true);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2008
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2009 int64_t parentId = 0;
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2010 if (transaction.LookupResource(parentId, remainingLevel, remainingPublicId))
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2011 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2012
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2013 do
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2014 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2015 content.AddMetadata(parentId, MetadataType_LastUpdate, now);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2016 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2017 while (transaction.LookupParent(parentId, parentId));
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2018
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2019 transaction.SetResourcesContent(content);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2020 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2021 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2022 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2023 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2024 {
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2025 remainingAncestor_["RemainingAncestor"] = Json::nullValue;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2026 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2027 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2028 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2029 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2030
4694 da1edb7d6332 "/tools/bulk-delete" to delete a group of multiple, unrelated resources at once Sebastien Jodogne <s.jodogne@gmail.com> parents: 4640 diff changeset	2031 Operations operations(remainingAncestor, uuid, expectedType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2032 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2033 return operations.IsFound();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2034 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2035
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2036
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2037 void StatelessDatabaseOperations::LogExportedResource(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2038 const std::string& remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2039 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2040 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2041 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2042 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2043 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2044 const std::string& remoteModality_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2045
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2046 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2047 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2048 const std::string& remoteModality) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2049 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2050 remoteModality_(remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2051 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2052 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2053
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2054 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2055 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2056 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2057 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2058 if (!transaction.LookupResource(id, type, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2059 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2060 throw OrthancException(ErrorCode_InexistentItem);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2061 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2062
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2063 std::string patientId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2064 std::string studyInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2065 std::string seriesInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2066 std::string sopInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2067
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2068 int64_t currentId = id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2069 ResourceType currentType = type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2070
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2071 // Iteratively go up inside the patient/study/series/instance hierarchy
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2072 bool done = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2073 while (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2074 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2075 DicomMap map;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2076 transaction.GetMainDicomTags(map, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2077
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2078 switch (currentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2079 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2080 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2081 if (map.HasTag(DICOM_TAG_PATIENT_ID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2082 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2083 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2084 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2085 done = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2086 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2087
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2088 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2089 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2090 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2091 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2092 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2093 currentType = ResourceType_Patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2094 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2095
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2096 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2097 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2098 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2099 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2100 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2101 currentType = ResourceType_Study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2102 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2103
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2104 case ResourceType_Instance:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2105 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2106 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2107 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2108 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2109 currentType = ResourceType_Series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2110 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2111
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2112 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2113 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2114 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2115
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2116 // If we have not reached the Patient level, find the parent of
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2117 // the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2118 if (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2119 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2120 bool ok = transaction.LookupParent(currentId, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2121 (void) ok; // Remove warning about unused variable in release builds
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2122 assert(ok);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2123 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2124 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2125
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2126 ExportedResource resource(-1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2127 type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2128 publicId_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2129 remoteModality_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2130 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2131 patientId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2132 studyInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2133 seriesInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2134 sopInstanceUid);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2135
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2136 transaction.LogExportedResource(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2137 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2138 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2139
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2140 Operations operations(publicId, remoteModality);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2141 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2142 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2143
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2144
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2145 void StatelessDatabaseOperations::SetProtectedPatient(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2146 bool isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2147 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2148 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2149 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2150 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2151 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2152 bool isProtected_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2153
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2154 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2155 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2156 bool isProtected) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2157 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2158 isProtected_(isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2159 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2160 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2161
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2162 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2163 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2164 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2165 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2166 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2167 if (!transaction.LookupResource(id, type, publicId_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2168 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2169 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2170 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2171 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2172 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2173 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2174 transaction.SetProtectedPatient(id, isProtected_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2175 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2176 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2177 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2178
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2179 Operations operations(publicId, isProtected);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2180 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2181
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2182 if (isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2183 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2184 LOG(INFO) << "Patient " << publicId << " has been protected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2185 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2186 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2187 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2188 LOG(INFO) << "Patient " << publicId << " has been unprotected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2189 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2190 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2191
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2192
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2193 void StatelessDatabaseOperations::SetMetadata(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2194 const std::string& publicId,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2195 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2196 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2197 bool hasOldRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2198 int64_t oldRevision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2199 const std::string& oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2200 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2201 class Operations : public IReadWriteOperations
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2202 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2203 private:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2204 int64_t& newRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2205 const std::string& publicId_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2206 MetadataType type_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2207 const std::string& value_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2208 bool hasOldRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2209 int64_t oldRevision_;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2210 const std::string& oldMD5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2211
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2212 public:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2213 Operations(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2214 const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2215 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2216 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2217 bool hasOldRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2218 int64_t oldRevision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2219 const std::string& oldMD5) :
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2220 newRevision_(newRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2221 publicId_(publicId),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2222 type_(type),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2223 value_(value),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2224 hasOldRevision_(hasOldRevision),
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2225 oldRevision_(oldRevision),
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2226 oldMD5_(oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2227 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2228 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2229
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2230 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2231 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2232 ResourceType resourceType;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2233 int64_t id;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2234 if (!transaction.LookupResource(id, resourceType, publicId_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2235 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2236 throw OrthancException(ErrorCode_UnknownResource);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2237 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2238 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2239 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2240 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2241 int64_t expectedRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2242 if (transaction.LookupMetadata(oldValue, expectedRevision, id, type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2243 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2244 if (hasOldRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2245 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2246 std::string expectedMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2247 Toolbox::ComputeMD5(expectedMD5, oldValue);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2248
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2249 if (expectedRevision != oldRevision_ \|\|
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2250 expectedMD5 != oldMD5_)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2251 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2252 throw OrthancException(ErrorCode_Revision);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2253 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2254 }
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2255
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2256 newRevision_ = expectedRevision + 1;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2257 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2258 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2259 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2260 // The metadata is not existing yet: Ignore "oldRevision"
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2261 // and initialize a new sequence of revisions
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2262 newRevision_ = 0;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2263 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2264
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2265 transaction.SetMetadata(id, type_, value_, newRevision_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2266
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2267 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2268 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2269 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2270 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2271 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2272 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2273 };
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2274
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2275 Operations operations(newRevision, publicId, type, value, hasOldRevision, oldRevision, oldMD5);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2276 Apply(operations);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2277 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2278
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2279
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2280 void StatelessDatabaseOperations::OverwriteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2281 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2282 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2283 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2284 int64_t newRevision; // Unused
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2285 SetMetadata(newRevision, publicId, type, value, false /* no old revision /, -1 / dummy /, "" / dummy */);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2286 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2287
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2288
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2289 bool StatelessDatabaseOperations::DeleteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2290 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2291 bool hasRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2292 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2293 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2294 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2295 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2296 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2297 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2298 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2299 MetadataType type_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2300 bool hasRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2301 int64_t revision_;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2302 const std::string& md5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2303 bool found_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2304
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2305 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2306 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2307 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2308 bool hasRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2309 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2310 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2311 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2312 type_(type),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2313 hasRevision_(hasRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2314 revision_(revision),
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2315 md5_(md5),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2316 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2317 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2318 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2319
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2320 bool HasFound() const
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2321 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2322 return found_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2323 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2324
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2325 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2326 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2327 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2328 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2329 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2330 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2331 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2332 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2333 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2334 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2335 std::string value;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2336 int64_t expectedRevision;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2337 if (transaction.LookupMetadata(value, expectedRevision, id, type_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2338 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2339 if (hasRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2340 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2341 std::string expectedMD5;
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2342 Toolbox::ComputeMD5(expectedMD5, value);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2343
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2344 if (expectedRevision != revision_ \|\|
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2345 expectedMD5 != md5_)
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2346 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2347 throw OrthancException(ErrorCode_Revision);
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2348 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2349 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2350
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2351 found_ = true;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2352 transaction.DeleteMetadata(id, type_);
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2353
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2354 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2355 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2356 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2357 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2358 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2359 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2360 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2361 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2362 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2363 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2364 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2365 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2366
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2367 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2368 Apply(operations);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2369 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2370 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2371
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2372
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2373 uint64_t StatelessDatabaseOperations::IncrementGlobalSequence(GlobalProperty sequence,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2374 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2375 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2376 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2377 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2378 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2379 uint64_t newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2380 GlobalProperty sequence_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2381 bool shared_;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2382 bool hasAtomicIncrementGlobalProperty_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2383
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2384 public:
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2385 Operations(GlobalProperty sequence,
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2386 bool shared,
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2387 bool hasAtomicIncrementGlobalProperty) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2388 newValue_(0), // Dummy initialization
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2389 sequence_(sequence),
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2390 shared_(shared),
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2391 hasAtomicIncrementGlobalProperty_(hasAtomicIncrementGlobalProperty)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2392 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2393 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2394
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2395 uint64_t GetNewValue() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2396 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2397 return newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2398 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2399
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2400 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2401 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2402 if (hasAtomicIncrementGlobalProperty_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2403 {
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2404 newValue_ = static_cast<uint64_t>(transaction.IncrementGlobalProperty(sequence_, shared_, 1));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2405 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2406 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2407 {
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2408 std::string oldString;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2409
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2410 if (transaction.LookupGlobalProperty(oldString, sequence_, shared_))
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2411 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2412 uint64_t oldValue;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2413
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2414 try
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2415 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2416 oldValue = boost::lexical_cast<uint64_t>(oldString);
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2417 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2418 catch (boost::bad_lexical_cast&)
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2419 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2420 LOG(ERROR) << "Cannot read the global sequence "
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	2421 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2422 oldValue = 0;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2423 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2424
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2425 newValue_ = oldValue + 1;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2426 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2427 else
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2428 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2429 // Initialize the sequence at "1"
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2430 newValue_ = 1;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2431 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2432
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2433 transaction.SetGlobalProperty(sequence_, shared_, boost::lexical_cast<std::string>(newValue_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2434 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2435 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2436 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2437
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2438 Operations operations(sequence, shared, GetDatabaseCapabilities().HasAtomicIncrementGlobalProperty());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2439 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2440 assert(operations.GetNewValue() != 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2441 return operations.GetNewValue();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2442 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2443
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2444
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2445 void StatelessDatabaseOperations::DeleteChanges()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2446 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2447 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2448 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2449 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2450 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2451 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2452 transaction.ClearChanges();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2453 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2454 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2455
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2456 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2457 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2458 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2459
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2460
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2461 void StatelessDatabaseOperations::DeleteExportedResources()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2462 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2463 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2464 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2465 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2466 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2467 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2468 transaction.ClearExportedResources();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2469 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2470 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2471
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2472 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2473 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2474 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2475
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2476
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2477 void StatelessDatabaseOperations::SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2478 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2479 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2480 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2481 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2482 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2483 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2484 GlobalProperty property_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2485 bool shared_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2486 const std::string& value_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2487
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2488 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2489 Operations(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2490 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2491 const std::string& value) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2492 property_(property),
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2493 shared_(shared),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2494 value_(value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2495 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2496 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2497
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2498 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2499 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2500 transaction.SetGlobalProperty(property_, shared_, value_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2501 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2502 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2503
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2504 Operations operations(property, shared, value);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2505 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2506 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2507
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2508
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2509 bool StatelessDatabaseOperations::DeleteAttachment(const std::string& publicId,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2510 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2511 bool hasRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2512 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2513 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2514 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2515 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2516 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2517 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2518 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2519 FileContentType type_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2520 bool hasRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2521 int64_t revision_;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2522 const std::string& md5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2523 bool found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2524
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2525 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2526 Operations(const std::string& publicId,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2527 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2528 bool hasRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2529 int64_t revision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2530 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2531 publicId_(publicId),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2532 type_(type),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2533 hasRevision_(hasRevision),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2534 revision_(revision),
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2535 md5_(md5),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2536 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2537 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2538 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2539
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2540 bool HasFound() const
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2541 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2542 return found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2543 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2544
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2545 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2546 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2547 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2548 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2549 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2550 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2551 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2552 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2553 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2554 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2555 FileInfo info;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2556 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2557 if (transaction.LookupAttachment(info, expectedRevision, id, type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2558 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2559 if (hasRevision_ &&
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2560 (expectedRevision != revision_ \|\|
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2561 info.GetUncompressedMD5() != md5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2562 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2563 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2564 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2565
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2566 found_ = true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2567 transaction.DeleteAttachment(id, type_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2568
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2569 if (IsUserContentType(type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2570 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2571 transaction.LogChange(id, ChangeType_UpdatedAttachment, resourceType, publicId_);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2572 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2573 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2574 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2575 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2576 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2577 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2578 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2579 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2580 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2581
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2582 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2583 Apply(operations);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2584 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2585 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2586
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2587
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2588 void StatelessDatabaseOperations::LogChange(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2589 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2590 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2591 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2592 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2593 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2594 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2595 private:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2596 int64_t internalId_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2597 ChangeType changeType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2598 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2599 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2600
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2601 public:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2602 Operations(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2603 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2604 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2605 ResourceType level) :
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2606 internalId_(internalId),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2607 changeType_(changeType),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2608 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2609 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2610 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2611 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2612
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2613 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2614 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2615 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2616 ResourceType type;
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2617 if (transaction.LookupResource(id, type, publicId_) &&
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2618 id == internalId_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2619 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2620 /**
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2621 * Make sure that the resource is still existing, with the
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2622 * same internal ID, which indicates the absence of bouncing
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2623 * (if deleting then recreating the same resource). Don't
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2624 * throw an exception if the resource has been deleted,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2625 * because this function might e.g. be called from
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2626 * "StatelessDatabaseOperations::UnstableResourcesMonitorThread()"
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2627 * (for which a deleted resource is not an error case).
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2628 **/
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2629 if (type == level_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2630 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2631 transaction.LogChange(id, changeType_, type, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2632 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2633 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2634 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2635 // Consistency check
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2636 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2637 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2638 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2639 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2640 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2641
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2642 Operations operations(internalId, changeType, publicId, level);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2643 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2644 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2645
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2646
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2647 static void GetMainDicomSequenceMetadataContent(std::string& result,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2648 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2649 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2650 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2651 DicomMap levelSummary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2652 DicomMap levelSequences;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2653
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2654 dicomSummary.ExtractResourceInformation(levelSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2655 levelSummary.ExtractSequences(levelSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2656
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2657 if (levelSequences.GetSize() > 0)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2658 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2659 Json::Value jsonMetadata;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2660 jsonMetadata["Version"] = 1;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2661 jsonMetadata["Sequences"] = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2662 FromDcmtkBridge::ToJson(jsonMetadata["Sequences"], levelSequences, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2663
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2664 Toolbox::WriteFastJson(result, jsonMetadata);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2665 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2666 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2667
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2668
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2669 void StatelessDatabaseOperations::ReconstructInstance(const ParsedDicomFile& dicom, bool limitToThisLevelDicomTags, ResourceType limitToLevel)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2670 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2671 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2672 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2673 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2674 DicomMap summary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2675 std::unique_ptr<DicomInstanceHasher> hasher_;
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2676 bool limitToThisLevelDicomTags_;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2677 ResourceType limitToLevel_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2678 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2679 DicomTransferSyntax transferSyntax_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2680
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2681 static void ReplaceMetadata(ReadWriteTransaction& transaction,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2682 int64_t instance,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2683 MetadataType metadata,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2684 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2685 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2686 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2687 int64_t oldRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2688
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2689 if (transaction.LookupMetadata(oldValue, oldRevision, instance, metadata))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2690 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2691 transaction.SetMetadata(instance, metadata, value, oldRevision + 1);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2692 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2693 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2694 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2695 transaction.SetMetadata(instance, metadata, value, 0);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2696 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2697 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2698
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2699 static void SetMainDicomSequenceMetadata(ReadWriteTransaction& transaction,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2700 int64_t instance,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2701 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2702 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2703 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2704 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2705 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2706
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2707 if (!serialized.empty())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2708 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2709 ReplaceMetadata(transaction, instance, MetadataType_MainDicomSequences, serialized);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2710 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2711 else
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2712 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2713 transaction.DeleteMetadata(instance, MetadataType_MainDicomSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2714 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2715
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2716 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2717
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2718 public:
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2719 explicit Operations(const ParsedDicomFile& dicom, bool limitToThisLevelDicomTags, ResourceType limitToLevel)
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	2720 : limitToThisLevelDicomTags_(limitToThisLevelDicomTags),
a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	2721 limitToLevel_(limitToLevel)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2722 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2723 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2724 hasher_.reset(new DicomInstanceHasher(summary_));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2725 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2726 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2727
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2728 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2729 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2730 int64_t patient = -1, study = -1, series = -1, instance = -1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2731
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2732 ResourceType type1, type2, type3, type4;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2733 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2734 !transaction.LookupResource(study, type2, hasher_->HashStudy()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2735 !transaction.LookupResource(series, type3, hasher_->HashSeries()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2736 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2737 type1 != ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2738 type2 != ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2739 type3 != ResourceType_Series \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2740 type4 != ResourceType_Instance \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2741 patient == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2742 study == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2743 series == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2744 instance == -1)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2745 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2746 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2747 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2748
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2749 if (limitToThisLevelDicomTags_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2750 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2751 ResourcesContent content(false /* prevent the setting of metadata */);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2752 int64_t resource = -1;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2753 if (limitToLevel_ == ResourceType_Patient)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2754 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2755 resource = patient;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2756 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2757 else if (limitToLevel_ == ResourceType_Study)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2758 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2759 resource = study;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2760 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2761 else if (limitToLevel_ == ResourceType_Series)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2762 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2763 resource = series;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2764 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2765 else if (limitToLevel_ == ResourceType_Instance)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2766 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2767 resource = instance;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2768 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2769
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2770 transaction.ClearMainDicomTags(resource);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2771 content.AddResource(resource, limitToLevel_, summary_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2772 transaction.SetResourcesContent(content);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2773 ReplaceMetadata(transaction, resource, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(limitToLevel_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2774 }
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2775 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2776 {
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2777 transaction.ClearMainDicomTags(patient);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2778 transaction.ClearMainDicomTags(study);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2779 transaction.ClearMainDicomTags(series);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2780 transaction.ClearMainDicomTags(instance);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2781
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2782 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2783 ResourcesContent content(false /* prevent the setting of metadata */);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2784 content.AddResource(patient, ResourceType_Patient, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2785 content.AddResource(study, ResourceType_Study, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2786 content.AddResource(series, ResourceType_Series, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2787 content.AddResource(instance, ResourceType_Instance, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2788
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2789 transaction.SetResourcesContent(content);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2790
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2791 ReplaceMetadata(transaction, patient, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2792 ReplaceMetadata(transaction, study, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2793 ReplaceMetadata(transaction, series, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2794 ReplaceMetadata(transaction, instance, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2795
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2796 SetMainDicomSequenceMetadata(transaction, patient, summary_, ResourceType_Patient);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2797 SetMainDicomSequenceMetadata(transaction, study, summary_, ResourceType_Study);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2798 SetMainDicomSequenceMetadata(transaction, series, summary_, ResourceType_Series);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2799 SetMainDicomSequenceMetadata(transaction, instance, summary_, ResourceType_Instance);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2800 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2801
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2802 if (hasTransferSyntax_)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2803 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2804 ReplaceMetadata(transaction, instance, MetadataType_Instance_TransferSyntax, GetTransferSyntaxUid(transferSyntax_));
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2805 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2806
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2807 const DicomValue* value;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2808 if ((value = summary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2809 !value->IsNull() &&
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2810 !value->IsBinary())
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2811 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2812 ReplaceMetadata(transaction, instance, MetadataType_Instance_SopClassUid, value->GetContent());
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2813 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2814 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2815 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2816 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2817
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2818 Operations operations(dicom, limitToThisLevelDicomTags, limitToLevel);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2819 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2820 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2821
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2822
5819 7c2b4fa94633 ReadOnly transactions Alain Mazy <am@orthanc.team> parents: 5817 diff changeset	2823 bool StatelessDatabaseOperations::ReadOnlyTransaction::HasReachedMaxStorageSize(uint64_t maximumStorageSize,
7c2b4fa94633 ReadOnly transactions Alain Mazy <am@orthanc.team> parents: 5817 diff changeset	2824 uint64_t addedInstanceSize)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2825 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2826 if (maximumStorageSize != 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2827 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2828 if (maximumStorageSize < addedInstanceSize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2829 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2830 throw OrthancException(ErrorCode_FullStorage, "Cannot store an instance of size " +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2831 boost::lexical_cast<std::string>(addedInstanceSize) +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2832 " bytes in a storage area limited to " +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2833 boost::lexical_cast<std::string>(maximumStorageSize));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2834 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2835
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2836 if (transaction_.IsDiskSizeAbove(maximumStorageSize - addedInstanceSize))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2837 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2838 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2839 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2840 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2841
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2842 return false;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2843 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2844
5819 7c2b4fa94633 ReadOnly transactions Alain Mazy <am@orthanc.team> parents: 5817 diff changeset	2845 bool StatelessDatabaseOperations::ReadOnlyTransaction::HasReachedMaxPatientCount(unsigned int maximumPatientCount,
7c2b4fa94633 ReadOnly transactions Alain Mazy <am@orthanc.team> parents: 5817 diff changeset	2846 const std::string& patientId)
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2847 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2848 if (maximumPatientCount != 0)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2849 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2850 uint64_t patientCount = transaction_.GetResourcesCount(ResourceType_Patient); // at this time, the new patient has already been added (as part of the transaction)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2851 return patientCount > maximumPatientCount;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2852 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2853
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2854 return false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2855 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2856
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2857 bool StatelessDatabaseOperations::ReadWriteTransaction::IsRecyclingNeeded(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2858 unsigned int maximumPatients,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2859 uint64_t addedInstanceSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2860 const std::string& newPatientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2861 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2862 return HasReachedMaxStorageSize(maximumStorageSize, addedInstanceSize)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2863 \|\| HasReachedMaxPatientCount(maximumPatients, newPatientId);
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2864 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2865
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2866 void StatelessDatabaseOperations::ReadWriteTransaction::Recycle(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2867 unsigned int maximumPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2868 uint64_t addedInstanceSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2869 const std::string& newPatientId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2870 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2871 // TODO - Performance: Avoid calls to "IsRecyclingNeeded()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2872
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2873 if (IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2874 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2875 // Check whether other DICOM instances from this patient are
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2876 // already stored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2877 int64_t patientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2878 bool hasPatientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2879
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2880 if (newPatientId.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2881 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2882 hasPatientToAvoid = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2883 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2884 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2885 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2886 ResourceType type;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2887 hasPatientToAvoid = transaction_.LookupResource(patientToAvoid, type, newPatientId);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2888 if (type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2889 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2890 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2891 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2892 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2893
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2894 // Iteratively select patient to remove until there is enough
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2895 // space in the DICOM store
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2896 int64_t patientToRecycle;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2897 while (true)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2898 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2899 // If other instances of this patient are already in the store,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2900 // we must avoid to recycle them
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2901 bool ok = (hasPatientToAvoid ?
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2902 transaction_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2903 transaction_.SelectPatientToRecycle(patientToRecycle));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2904
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2905 if (!ok)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2906 {
4801 23aeffecb8cb Fix instances accumulating in DB while their attachments were not stored because of MaximumStorageSize limit reached with a single patient in DB. Alain Mazy <am@osimis.io> parents: 4697 diff changeset	2907 throw OrthancException(ErrorCode_FullStorage, "Cannot recycle more patients");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2908 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2909
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2910 LOG(TRACE) << "Recycling one patient";
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2911 transaction_.DeleteResource(patientToRecycle);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2912
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2913 if (!IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2914 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2915 // OK, we're done
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2916 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2917 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2918 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2919 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2920 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2921
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2922
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2923 void StatelessDatabaseOperations::StandaloneRecycling(MaxStorageMode maximumStorageMode,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2924 uint64_t maximumStorageSize,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2925 unsigned int maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2926 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2927 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2928 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2929 private:
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2930 uint64_t maximumStorageSize_;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2931 unsigned int maximumPatientCount_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2932
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2933 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2934 Operations(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2935 unsigned int maximumPatientCount) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2936 maximumStorageSize_(maximumStorageSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2937 maximumPatientCount_(maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2938 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2939 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2940
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2941 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2942 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2943 transaction.Recycle(maximumStorageSize_, maximumPatientCount_, 0, "");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2944 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2945 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2946
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2947 if (maximumStorageMode == MaxStorageMode_Recycle
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	2948 && (maximumStorageSize != 0 \|\| maximumPatientCount != 0))
4602 cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2949 {
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2950 Operations operations(maximumStorageSize, maximumPatientCount);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2951 Apply(operations);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2952 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2953 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2954
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2955
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2956 StoreStatus StatelessDatabaseOperations::Store(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2957 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2958 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2959 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2960 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2961 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2962 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2963 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2964 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2965 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	2966 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2967 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2968 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2969 unsigned int maximumPatients,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2970 bool isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2971 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2972 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2973 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2974 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2975 StoreStatus storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2976 std::map<MetadataType, std::string>& instanceMetadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2977 const DicomMap& dicomSummary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2978 const Attachments& attachments_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2979 const MetadataMap& metadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2980 const DicomInstanceOrigin& origin_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2981 bool overwrite_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2982 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2983 DicomTransferSyntax transferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2984 bool hasPixelDataOffset_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2985 uint64_t pixelDataOffset_;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	2986 ValueRepresentation pixelDataVR_;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2987 MaxStorageMode maximumStorageMode_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2988 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2989 unsigned int maximumPatientCount_;
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2990 bool isReconstruct_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2991
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2992 // Auto-computed fields
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2993 bool hasExpectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2994 int64_t expectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2995 std::string hashPatient_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2996 std::string hashStudy_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2997 std::string hashSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2998 std::string hashInstance_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2999
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3000
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3001 static void SetInstanceMetadata(ResourcesContent& content,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3002 std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3003 int64_t instance,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3004 MetadataType metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3005 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3006 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3007 content.AddMetadata(instance, metadata, value);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3008 instanceMetadata[metadata] = value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3009 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3010
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3011 static void SetMainDicomSequenceMetadata(ResourcesContent& content,
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	3012 int64_t resource,
a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	3013 const DicomMap& dicomSummary,
a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	3014 ResourceType level)
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3015 {
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3016 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3017 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3018
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3019 if (!serialized.empty())
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3020 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3021 content.AddMetadata(resource, MetadataType_MainDicomSequences, serialized);
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3022 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3023 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3024
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3025 static bool ComputeExpectedNumberOfInstances(int64_t& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3026 const DicomMap& dicomSummary)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3027 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3028 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3029 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3030 const DicomValue* value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3031 const DicomValue* value2;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3032
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3033 if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_IMAGES_IN_ACQUISITION)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3034 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3035 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3036 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TEMPORAL_POSITIONS)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3037 !value2->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3038 !value2->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3039 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3040 // Patch for series with temporal positions thanks to Will Ryder
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3041 int64_t imagesInAcquisition = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3042 int64_t countTemporalPositions = boost::lexical_cast<int64_t>(value2->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3043 target = imagesInAcquisition * countTemporalPositions;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3044 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3045 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3046
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3047 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_SLICES)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3048 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3049 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3050 (value2 = dicomSummary.TestAndGetValue(DICOM_TAG_NUMBER_OF_TIME_SLICES)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3051 !value2->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3052 !value2->IsNull())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3053 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3054 // Support of Cardio-PET images
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3055 int64_t numberOfSlices = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3056 int64_t numberOfTimeSlices = boost::lexical_cast<int64_t>(value2->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3057 target = numberOfSlices * numberOfTimeSlices;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3058 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3059 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3060
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3061 else if ((value = dicomSummary.TestAndGetValue(DICOM_TAG_CARDIAC_NUMBER_OF_IMAGES)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3062 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3063 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3064 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3065 target = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3066 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3067 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3068 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3069 catch (OrthancException&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3070 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3071 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3072 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3073 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3074 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3075
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3076 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3077 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3078
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3079 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3080 Operations(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3081 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3082 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3083 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3084 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3085 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3086 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3087 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3088 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3089 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3090 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3091 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3092 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3093 unsigned int maximumPatientCount,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3094 bool isReconstruct) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3095 storeStatus_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3096 instanceMetadata_(instanceMetadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3097 dicomSummary_(dicomSummary),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3098 attachments_(attachments),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3099 metadata_(metadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3100 origin_(origin),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3101 overwrite_(overwrite),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3102 hasTransferSyntax_(hasTransferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3103 transferSyntax_(transferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3104 hasPixelDataOffset_(hasPixelDataOffset),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3105 pixelDataOffset_(pixelDataOffset),
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3106 pixelDataVR_(pixelDataVR),
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3107 maximumStorageMode_(maximumStorageMode),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3108 maximumStorageSize_(maximumStorageSize),
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3109 maximumPatientCount_(maximumPatientCount),
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3110 isReconstruct_(isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3111 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3112 hasExpectedInstances_ = ComputeExpectedNumberOfInstances(expectedInstances_, dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3113
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3114 instanceMetadata_.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3115
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3116 DicomInstanceHasher hasher(dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3117 hashPatient_ = hasher.HashPatient();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3118 hashStudy_ = hasher.HashStudy();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3119 hashSeries_ = hasher.HashSeries();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3120 hashInstance_ = hasher.HashInstance();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3121 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3122
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3123 StoreStatus GetStoreStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3124 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3125 return storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3126 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3127
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3128 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3129 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3130 IDatabaseWrapper::CreateInstanceResult status;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3131 int64_t instanceId;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3132
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3133 bool isNewInstance = transaction.CreateInstance(status, instanceId, hashPatient_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3134 hashStudy_, hashSeries_, hashInstance_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3135
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3136 if (isReconstruct_ && isNewInstance)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3137 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3138 // In case of reconstruct, we just want to modify the attachments and some metadata like the TransferSyntex
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3139 // The DicomTags and many metadata have already been updated before we get here in ReconstructInstance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3140 throw OrthancException(ErrorCode_InternalError, "New instance while reconstructing; this should not happen.");
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3141 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3142
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3143 // Check whether this instance is already stored
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3144 if (!isNewInstance && !isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3145 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3146 // The instance already exists
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3147 if (overwrite_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3148 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3149 // Overwrite the old instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3150 LOG(INFO) << "Overwriting instance: " << hashInstance_;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3151 transaction.DeleteResource(instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3152
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3153 // Re-create the instance, now that the old one is removed
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3154 if (!transaction.CreateInstance(status, instanceId, hashPatient_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3155 hashStudy_, hashSeries_, hashInstance_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3156 {
5456 06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3157 // Note that, sometime, it does not create a new instance,
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3158 // in very rare occasions in READ COMMITTED mode when multiple clients are pushing the same instance at the same time,
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3159 // this thread will not create the instance because another thread has created it in the meantime.
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3160 // At the end, there is always a thread that creates the instance and this is what we expect.
5464 38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3161
38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3162 // Note, we must delete the attachments that have already been stored from this failed insertion (they have not yet been added into the DB)
38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3163 throw OrthancException(ErrorCode_DuplicateResource, "No new instance while overwriting; this might happen if another client has pushed the same instance at the same time.");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3164 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3165 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3166 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3167 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3168 // Do nothing if the instance already exists and overwriting is disabled
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3169 transaction.GetAllMetadata(instanceMetadata_, instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3170 storeStatus_ = StoreStatus_AlreadyStored;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3171 return;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3172 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3173 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3174
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3175
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3176 if (!isReconstruct_) // don't signal new resources if this is a reconstruction
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3177 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3178 // Warn about the creation of new resources. The order must be
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3179 // from instance to patient.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3180
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3181 // NB: In theory, could be sped up by grouping the underlying
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3182 // calls to "transaction.LogChange()". However, this would only have an
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3183 // impact when new patient/study/series get created, which
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3184 // occurs far less often that creating new instances. The
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3185 // positive impact looks marginal in practice.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3186 transaction.LogChange(instanceId, ChangeType_NewInstance, ResourceType_Instance, hashInstance_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3187
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3188 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3189 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3190 transaction.LogChange(status.seriesId_, ChangeType_NewSeries, ResourceType_Series, hashSeries_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3191 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3192
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3193 if (status.isNewStudy_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3194 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3195 transaction.LogChange(status.studyId_, ChangeType_NewStudy, ResourceType_Study, hashStudy_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3196 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3197
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3198 if (status.isNewPatient_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3199 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3200 transaction.LogChange(status.patientId_, ChangeType_NewPatient, ResourceType_Patient, hashPatient_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3201 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3202 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3203
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3204 // Ensure there is enough room in the storage for the new instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3205 uint64_t instanceSize = 0;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3206 for (Attachments::const_iterator it = attachments_.begin();
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	3207 it != attachments_.end(); ++it)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3208 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3209 instanceSize += it->GetCompressedSize();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3210 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3211
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3212 if (!isReconstruct_) // reconstruction should not affect recycling
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3213 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3214 if (maximumStorageMode_ == MaxStorageMode_Reject)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3215 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3216 if (transaction.HasReachedMaxStorageSize(maximumStorageSize_, instanceSize))
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3217 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3218 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3219 throw OrthancException(ErrorCode_FullStorage, HttpStatus_507_InsufficientStorage, "Maximum storage size reached"); // throw to cancel the transaction
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3220 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3221 if (transaction.HasReachedMaxPatientCount(maximumPatientCount_, hashPatient_))
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3222 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3223 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3224 throw OrthancException(ErrorCode_FullStorage, HttpStatus_507_InsufficientStorage, "Maximum patient count reached"); // throw to cancel the transaction
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3225 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3226 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3227 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3228 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3229 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3230 instanceSize, hashPatient_ /* don't consider the current patient for recycling */);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3231 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3232 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3233
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3234 // Attach the files to the newly created instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3235 for (Attachments::const_iterator it = attachments_.begin();
5595 a87f2a56257d implemented FindRequest::retrieveChildrenMetadata_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5593 diff changeset	3236 it != attachments_.end(); ++it)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3237 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3238 if (isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3239 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3240 // we are replacing attachments during a reconstruction
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3241 transaction.DeleteAttachment(instanceId, it->GetContentType());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3242 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3243
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3244 transaction.AddAttachment(instanceId, it, 0 / this is the first revision */);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3245 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3246
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3247 ResourcesContent content(true /* new resource, metadata can be set */);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3248
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3249 // Attach the user-specified metadata (in case of reconstruction, metadata_ contains all past metadata, including the system ones we want to keep)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3250 for (MetadataMap::const_iterator
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3251 it = metadata_.begin(); it != metadata_.end(); ++it)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3252 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3253 switch (it->first.first)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3254 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3255 case ResourceType_Patient:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3256 content.AddMetadata(status.patientId_, it->first.second, it->second);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3257 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3258
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3259 case ResourceType_Study:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3260 content.AddMetadata(status.studyId_, it->first.second, it->second);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3261 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3262
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3263 case ResourceType_Series:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3264 content.AddMetadata(status.seriesId_, it->first.second, it->second);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3265 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3266
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3267 case ResourceType_Instance:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3268 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3269 it->first.second, it->second);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3270 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3271
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3272 default:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3273 throw OrthancException(ErrorCode_ParameterOutOfRange);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3274 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3275 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3276
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3277 if (!isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3278 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3279 // Populate the tags of the newly-created resources
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3280 content.AddResource(instanceId, ResourceType_Instance, dicomSummary_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3281 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance)); // New in Orthanc 1.11.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3282 SetMainDicomSequenceMetadata(content, instanceId, dicomSummary_, ResourceType_Instance); // new in Orthanc 1.11.1
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3283
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3284 if (status.isNewSeries_)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3285 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3286 content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3287 content.AddMetadata(status.seriesId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series)); // New in Orthanc 1.11.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3288 SetMainDicomSequenceMetadata(content, status.seriesId_, dicomSummary_, ResourceType_Series); // new in Orthanc 1.11.1
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3289 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3290
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3291 if (status.isNewStudy_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3292 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3293 content.AddResource(status.studyId_, ResourceType_Study, dicomSummary_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3294 content.AddMetadata(status.studyId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study)); // New in Orthanc 1.11.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3295 SetMainDicomSequenceMetadata(content, status.studyId_, dicomSummary_, ResourceType_Study); // new in Orthanc 1.11.1
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3296 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3297
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3298 if (status.isNewPatient_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3299 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3300 content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3301 content.AddMetadata(status.patientId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient)); // New in Orthanc 1.11.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3302 SetMainDicomSequenceMetadata(content, status.patientId_, dicomSummary_, ResourceType_Patient); // new in Orthanc 1.11.1
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3303 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3304
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3305 // Attach the auto-computed metadata for the patient/study/series levels
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3306 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3307 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3308 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3309 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3310
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3311 if (status.isNewSeries_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3312 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3313 if (hasExpectedInstances_)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3314 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3315 content.AddMetadata(status.seriesId_, MetadataType_Series_ExpectedNumberOfInstances,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3316 boost::lexical_cast<std::string>(expectedInstances_));
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3317 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3318
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3319 // New in Orthanc 1.9.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3320 content.AddMetadata(status.seriesId_, MetadataType_RemoteAet,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3321 origin_.GetRemoteAetC());
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3322 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3323 // Attach the auto-computed metadata for the instance level,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3324 // reflecting these additions into the input metadata map
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3325 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3326 MetadataType_Instance_ReceptionDate, now);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3327 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_RemoteAet,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3328 origin_.GetRemoteAetC());
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3329 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_Instance_Origin,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3330 EnumerationToString(origin_.GetRequestOrigin()));
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3331
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3332 std::string s;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3333
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3334 if (origin_.LookupRemoteIp(s))
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3335 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3336 // New in Orthanc 1.4.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3337 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3338 MetadataType_Instance_RemoteIp, s);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3339 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3340
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3341 if (origin_.LookupCalledAet(s))
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3342 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3343 // New in Orthanc 1.4.0
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3344 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3345 MetadataType_Instance_CalledAet, s);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3346 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3347
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3348 if (origin_.LookupHttpUsername(s))
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3349 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3350 // New in Orthanc 1.4.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3351 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3352 MetadataType_Instance_HttpUsername, s);
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3353 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3354 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3355
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3356 // Following metadatas are also updated if reconstructing the instance.
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3357 // They might be missing since they have been introduced along Orthanc versions.
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3358
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3359 if (hasTransferSyntax_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3360 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3361 // New in Orthanc 1.2.0
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3362 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3363 MetadataType_Instance_TransferSyntax,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3364 GetTransferSyntaxUid(transferSyntax_));
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3365 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3366
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3367 if (hasPixelDataOffset_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3368 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3369 // New in Orthanc 1.9.1
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3370 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3371 MetadataType_Instance_PixelDataOffset,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3372 boost::lexical_cast<std::string>(pixelDataOffset_));
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3373
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3374 // New in Orthanc 1.12.1
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3375 if (dicomSummary_.GuessPixelDataValueRepresentation(transferSyntax_) != pixelDataVR_)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3376 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3377 // Store the VR of pixel data if it doesn't comply with the standard
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3378 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3379 MetadataType_Instance_PixelDataVR,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3380 EnumerationToString(pixelDataVR_));
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3381 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3382 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3383
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3384 const DicomValue* value;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3385 if ((value = dicomSummary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3386 !value->IsNull() &&
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3387 !value->IsBinary())
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3388 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3389 SetInstanceMetadata(content, instanceMetadata_, instanceId,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3390 MetadataType_Instance_SopClassUid, value->GetContent());
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3391 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3392
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3393
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3394 if ((value = dicomSummary_.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3395 (value = dicomSummary_.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3396 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3397 if (!value->IsNull() &&
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3398 !value->IsBinary())
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3399 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3400 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3401 MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3402 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3403 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3404
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3405
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3406 transaction.SetResourcesContent(content);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3407
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3408
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3409 if (!isReconstruct_) // a reconstruct shall not trigger any events
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3410 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3411 // Check whether the series of this new instance is now completed
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3412 int64_t expectedNumberOfInstances;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3413 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary_))
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3414 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3415 SeriesStatus seriesStatus = transaction.GetSeriesStatus(status.seriesId_, expectedNumberOfInstances);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3416 if (seriesStatus == SeriesStatus_Complete)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3417 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3418 transaction.LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3419 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3420 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3421
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3422 transaction.LogChange(status.seriesId_, ChangeType_NewChildInstance, ResourceType_Series, hashSeries_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3423 transaction.LogChange(status.studyId_, ChangeType_NewChildInstance, ResourceType_Study, hashStudy_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3424 transaction.LogChange(status.patientId_, ChangeType_NewChildInstance, ResourceType_Patient, hashPatient_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3425
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3426 // Mark the parent resources of this instance as unstable
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3427 transaction.GetTransactionContext().MarkAsUnstable(ResourceType_Series, status.seriesId_, hashSeries_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3428 transaction.GetTransactionContext().MarkAsUnstable(ResourceType_Study, status.studyId_, hashStudy_);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3429 transaction.GetTransactionContext().MarkAsUnstable(ResourceType_Patient, status.patientId_, hashPatient_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3430 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3431
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3432 transaction.GetTransactionContext().SignalAttachmentsAdded(instanceSize);
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3433 storeStatus_ = StoreStatus_Success;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3434 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3435 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3436
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3437
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3438 Operations operations(instanceMetadata, dicomSummary, attachments, metadata, origin, overwrite,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3439 hasTransferSyntax, transferSyntax, hasPixelDataOffset, pixelDataOffset,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3440 pixelDataVR, maximumStorageMode, maximumStorageSize, maximumPatients, isReconstruct);
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3441
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3442 try
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3443 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3444 Apply(operations);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3445 return operations.GetStoreStatus();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3446 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3447 catch (OrthancException& e)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3448 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3449 if (e.GetErrorCode() == ErrorCode_FullStorage)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3450 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3451 return StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3452 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3453 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3454 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3455 // the transaction has failed -> do not commit the current transaction (and retry)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3456 throw;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3457 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3458 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3459 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3460
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3461
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3462 StoreStatus StatelessDatabaseOperations::AddAttachment(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3463 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3464 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3465 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3466 unsigned int maximumPatients,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3467 bool hasOldRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3468 int64_t oldRevision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3469 const std::string& oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3470 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3471 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3472 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3473 private:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3474 int64_t& newRevision_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3475 StoreStatus status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3476 const FileInfo& attachment_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3477 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3478 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3479 unsigned int maximumPatientCount_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3480 bool hasOldRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3481 int64_t oldRevision_;
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3482 const std::string& oldMD5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3483
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3484 public:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3485 Operations(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3486 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3487 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3488 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3489 unsigned int maximumPatientCount,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3490 bool hasOldRevision,
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3491 int64_t oldRevision,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3492 const std::string& oldMD5) :
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3493 newRevision_(newRevision),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3494 status_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3495 attachment_(attachment),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3496 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3497 maximumStorageSize_(maximumStorageSize),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3498 maximumPatientCount_(maximumPatientCount),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3499 hasOldRevision_(hasOldRevision),
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3500 oldRevision_(oldRevision),
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3501 oldMD5_(oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3502 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3503 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3504
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3505 StoreStatus GetStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3506 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3507 return status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3508 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3509
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3510 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3511 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3512 ResourceType resourceType;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3513 int64_t resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3514 if (!transaction.LookupResource(resourceId, resourceType, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3515 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3516 throw OrthancException(ErrorCode_InexistentItem, HttpStatus_404_NotFound);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3517 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3518 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3519 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3520 // Possibly remove previous attachment
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3521 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3522 FileInfo oldFile;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3523 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3524 if (transaction.LookupAttachment(oldFile, expectedRevision, resourceId, attachment_.GetContentType()))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3525 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3526 if (hasOldRevision_ &&
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3527 (expectedRevision != oldRevision_ \|\|
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3528 oldFile.GetUncompressedMD5() != oldMD5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3529 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3530 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3531 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3532 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3533 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3534 newRevision_ = expectedRevision + 1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3535 transaction.DeleteAttachment(resourceId, attachment_.GetContentType());
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3536 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3537 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3538 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3539 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3540 // The attachment is not existing yet: Ignore "oldRevision"
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3541 // and initialize a new sequence of revisions
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3542 newRevision_ = 0;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3543 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3544 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3545
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3546 // Locate the patient of the target resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3547 int64_t patientId = resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3548 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3549 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3550 int64_t parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3551 if (transaction.LookupParent(parent, patientId))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3552 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3553 // We have not reached the patient level yet
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3554 patientId = parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3555 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3556 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3557 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3558 // We have reached the patient level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3559 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3560 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3561 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3562
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3563 // Possibly apply the recycling mechanism while preserving this patient
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3564 assert(transaction.GetResourceType(patientId) == ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3565 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3566 attachment_.GetCompressedSize(), transaction.GetPublicId(patientId));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3567
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3568 transaction.AddAttachment(resourceId, attachment_, newRevision_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3569
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3570 if (IsUserContentType(attachment_.GetContentType()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3571 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3572 transaction.LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3573 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3574
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3575 transaction.GetTransactionContext().SignalAttachmentsAdded(attachment_.GetCompressedSize());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3576
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3577 status_ = StoreStatus_Success;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3578 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3579 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3580 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3581
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3582
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3583 Operations operations(newRevision, attachment, publicId, maximumStorageSize, maximumPatients,
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	3584 hasOldRevision, oldRevision, oldMD5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3585 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3586 return operations.GetStatus();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3587 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3588
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3589
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3590 void StatelessDatabaseOperations::ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3591 const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3592 ResourceType level)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3593 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3594 class Operations : public ReadOnlyOperationsT3<std::set<std::string>&, const std::string&, ResourceType>
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3595 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3596 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3597 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3598 const Tuple& tuple) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3599 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3600 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3601 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3602 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3603 tuple.get<2>() != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3604 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3605 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3606 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3607 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3608 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3609 transaction.ListLabels(tuple.get<0>(), id);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3610 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3611 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3612 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3613
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3614 Operations operations;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3615 operations.Apply(*this, target, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3616 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3617
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3618
5249 f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3619 void StatelessDatabaseOperations::ListAllLabels(std::set<std::string>& target)
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3620 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3621 class Operations : public ReadOnlyOperationsT1<std::set<std::string>& >
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3622 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3623 public:
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3624 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3625 const Tuple& tuple) ORTHANC_OVERRIDE
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3626 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3627 transaction.ListAllLabels(tuple.get<0>());
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3628 }
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3629 };
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3630
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3631 Operations operations;
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3632 operations.Apply(*this, target);
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3633 }
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3634
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3635
5495 4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3636 void StatelessDatabaseOperations::AddLabels(const std::string& publicId,
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3637 ResourceType level,
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3638 const std::set<std::string>& labels)
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3639 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3640 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3641 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3642 ModifyLabel(publicId, level, *it, LabelOperation_Add);
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3643 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3644 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3645
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3646
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3647 void StatelessDatabaseOperations::ModifyLabel(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3648 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3649 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3650 LabelOperation operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3651 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3652 class Operations : public IReadWriteOperations
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3653 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3654 private:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3655 const std::string& publicId_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3656 ResourceType level_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3657 const std::string& label_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3658 LabelOperation operation_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3659
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3660 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3661 Operations(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3662 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3663 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3664 LabelOperation operation) :
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3665 publicId_(publicId),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3666 level_(level),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3667 label_(label),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3668 operation_(operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3669 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3670 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3671
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3672 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3673 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3674 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3675 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3676 if (!transaction.LookupResource(id, type, publicId_) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3677 level_ != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3678 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3679 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3680 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3681 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3682 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3683 switch (operation_)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3684 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3685 case LabelOperation_Add:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3686 transaction.AddLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3687 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3688
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3689 case LabelOperation_Remove:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3690 transaction.RemoveLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3691 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3692
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3693 default:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3694 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3695 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3696 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3697 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3698 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3699
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	3700 ServerToolbox::CheckValidLabel(label);
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3701
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3702 Operations operations(publicId, level, label, operation);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3703 Apply(operations);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3704 }
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3705
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3706
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3707 bool StatelessDatabaseOperations::HasLabelsSupport()
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3708 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3709 boost::shared_lock<boost::shared_mutex> lock(mutex_);
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	3710 return db_.GetDatabaseCapabilities().HasLabelsSupport();
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3711 }
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3712
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	3713 bool StatelessDatabaseOperations::HasExtendedChanges()
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3714 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3715 boost::shared_lock<boost::shared_mutex> lock(mutex_);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	3716 return db_.GetDatabaseCapabilities().HasExtendedChanges();
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3717 }
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3718
5776 de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3719 bool StatelessDatabaseOperations::HasFindSupport()
de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3720 {
de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3721 boost::shared_lock<boost::shared_mutex> lock(mutex_);
de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3722 return db_.GetDatabaseCapabilities().HasFindSupport();
de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3723 }
de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	3724
5837 82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3725 void StatelessDatabaseOperations::ExecuteCount(uint64_t& count,
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3726 const FindRequest& request)
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3727 {
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3728 class IntegratedCount : public ReadOnlyOperationsT3<uint64_t&, const FindRequest&,
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3729 const IDatabaseWrapper::Capabilities&>
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3730 {
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3731 public:
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3732 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3733 const Tuple& tuple) ORTHANC_OVERRIDE
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3734 {
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3735 transaction.ExecuteCount(tuple.get<0>(), tuple.get<1>(), tuple.get<2>());
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3736 }
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3737 };
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3738
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3739 IDatabaseWrapper::Capabilities capabilities = db_.GetDatabaseCapabilities();
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3740
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3741 if (db_.HasIntegratedFind())
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3742 {
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3743 IntegratedCount operations;
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3744 operations.Apply(*this, count, request, capabilities);
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3745 }
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3746 else
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3747 {
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3748 throw OrthancException(ErrorCode_NotImplemented);
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3749 }
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3750 }
82fc95cc168c /tools/count-resources Alain Mazy <am@orthanc.team> parents: 5828 diff changeset	3751
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3752 void StatelessDatabaseOperations::ExecuteFind(FindResponse& response,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3753 const FindRequest& request)
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3754 {
5677 dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3755 class IntegratedFind : public ReadOnlyOperationsT3<FindResponse&, const FindRequest&,
dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3756 const IDatabaseWrapper::Capabilities&>
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3757 {
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3758 public:
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3759 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3760 const Tuple& tuple) ORTHANC_OVERRIDE
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3761 {
5677 dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3762 transaction.ExecuteFind(tuple.get<0>(), tuple.get<1>(), tuple.get<2>());
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3763 }
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3764 };
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3765
5720 89d559e67b03 fix compatibility with old database plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5693 diff changeset	3766 class FindStage : public ReadOnlyOperationsT3<std::list<std::string>&, const IDatabaseWrapper::Capabilities&, const FindRequest& >
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3767 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3768 public:
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3769 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3770 const Tuple& tuple) ORTHANC_OVERRIDE
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3771 {
5677 dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3772 transaction.ExecuteFind(tuple.get<0>(), tuple.get<1>(), tuple.get<2>());
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3773 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3774 };
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3775
5720 89d559e67b03 fix compatibility with old database plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5693 diff changeset	3776 class ExpandStage : public ReadOnlyOperationsT4<FindResponse&, const IDatabaseWrapper::Capabilities&, const FindRequest&, const std::string&>
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3777 {
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3778 public:
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3779 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3780 const Tuple& tuple) ORTHANC_OVERRIDE
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3781 {
5720 89d559e67b03 fix compatibility with old database plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5693 diff changeset	3782 transaction.ExecuteExpand(tuple.get<0>(), tuple.get<1>(), tuple.get<2>(), tuple.get<3>());
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3783 }
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3784 };
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3785
5677 dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3786 IDatabaseWrapper::Capabilities capabilities = db_.GetDatabaseCapabilities();
dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3787
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3788 if (db_.HasIntegratedFind())
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3789 {
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3790 /**
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3791 * In this flavor, the "find" and the "expand" phases are
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3792 * executed in one single transaction.
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3793 **/
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3794 IntegratedFind operations;
5677 dc96401dbe88 starting the refactoring of /tools/find Sebastien Jodogne <s.jodogne@gmail.com> parents: 5641 diff changeset	3795 operations.Apply(*this, response, request, capabilities);
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3796 }
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3797 else
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3798 {
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3799 /**
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3800 * In this flavor, the "find" and the "expand" phases for each
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3801 * found resource are executed in distinct transactions. This is
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3802 * the compatibility mode equivalent to Orthanc <= 1.12.3.
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3803 **/
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3804 std::list<std::string> identifiers;
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3805
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3806 FindStage find;
5720 89d559e67b03 fix compatibility with old database plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5693 diff changeset	3807 find.Apply(*this, identifiers, capabilities, request);
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3808
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3809 ExpandStage expand;
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3810
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3811 for (std::list<std::string>::const_iterator it = identifiers.begin(); it != identifiers.end(); ++it)
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3812 {
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3813 /**
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3814 * Not that the resource might have been deleted (as we are in
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3815 * another transaction). The database engine must ignore such
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3816 * error cases.
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3817 **/
5720 89d559e67b03 fix compatibility with old database plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 5693 diff changeset	3818 expand.Apply(this, response, capabilities, request, it);
5593 862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3819 }
862b54b4cfe2 implemented the default multi-stage find/expand Sebastien Jodogne <s.jodogne@gmail.com> parents: 5592 diff changeset	3820 }
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3821 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3822 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5842:08e47734328e find-refactoring