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

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5663:3765085693e5 large-queries

merge default -> large-queries

author	Alain Mazy <am@orthanc.team>
date	Thu, 04 Jul 2024 07:40:58 +0200
parents	28cc06e4859a f7adfb22e20e
children	5463c3ae3235

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);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	284 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	285
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	286
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 static void CopyListToVector(std::vector<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 const std::list<std::string>& source)
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 target.resize(source.size());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292 size_t pos = 0;
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 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 it = source.begin(); it != source.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 target[pos] = *it;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 pos ++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	299 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	302
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 class StatelessDatabaseOperations::MainDicomTagsRegistry : public boost::noncopyable
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 class TagInfo
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310 DicomTagType type_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 TagInfo()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	315 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	316
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 TagInfo(ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 DicomTagType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 level_(level),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 type_(type)
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 ResourceType GetLevel() const
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 return level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	327 }
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 DicomTagType GetType() const
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 return type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	332 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335 typedef std::map<DicomTag, TagInfo> Registry;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336
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 Registry registry_;
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 void LoadTags(ResourceType level)
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 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 const DicomTag* tags = NULL;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344 size_t size;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346 ServerToolbox::LoadIdentifiers(tags, size, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 for (size_t i = 0; i < size; i++)
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 if (registry_.find(tags[i]) == registry_.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 registry_[tags[i]] = TagInfo(level, DicomTagType_Identifier);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 else
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 // These patient-level tags are copied in the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 assert(level == ResourceType_Study &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 (tags[i] == DICOM_TAG_PATIENT_ID \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 tags[i] == DICOM_TAG_PATIENT_NAME \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 tags[i] == DICOM_TAG_PATIENT_BIRTH_DATE));
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	366 std::set<DicomTag> tags;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	367 DicomMap::GetMainDicomTags(tags, level);
4586 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 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 tag = tags.begin(); tag != tags.end(); ++tag)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 if (registry_.find(*tag) == registry_.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 registry_[*tag] = TagInfo(level, DicomTagType_Main);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	375 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	376 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	377 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 MainDicomTagsRegistry()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 LoadTags(ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 LoadTags(ResourceType_Study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 LoadTags(ResourceType_Series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 LoadTags(ResourceType_Instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	387 }
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 void LookupTag(ResourceType& level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 DicomTagType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 const DicomTag& tag) const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393 Registry::const_iterator it = registry_.find(tag);
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 if (it == registry_.end())
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 // Default values
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 level = ResourceType_Instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 type = DicomTagType_Generic;
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 else
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 level = it->second.GetLevel();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 type = it->second.GetType();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	408
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	409
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 void StatelessDatabaseOperations::ReadWriteTransaction::LogChange(int64_t internalId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 ChangeType changeType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415 ServerIndexChange change(changeType, resourceType, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 if (changeType <= ChangeType_INTERNAL_LastLogged)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	418 {
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	419 transaction_.LogChange(changeType, resourceType, internalId, publicId, change.GetDate());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	420 }
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 GetTransactionContext().SignalChange(change);
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
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 SeriesStatus StatelessDatabaseOperations::ReadOnlyTransaction::GetSeriesStatus(int64_t id,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 int64_t expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	429 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	430 transaction_.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432 std::set<int64_t> instances;
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 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 it = values.begin(); it != values.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437 int64_t index;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 try
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 index = boost::lexical_cast<int64_t>(*it);
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 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 return SeriesStatus_Unknown;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	446 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	447
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 if (!(index > 0 && index <= expectedNumberOfInstances))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 // Out-of-range instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 return SeriesStatus_Inconsistent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452 }
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 if (instances.find(index) != instances.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 // Twice the same instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 return SeriesStatus_Inconsistent;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 instances.insert(index);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 return SeriesStatus_Complete;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 else
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 return SeriesStatus_Missing;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	470 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	471 }
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 void StatelessDatabaseOperations::NormalizeLookup(std::vector<DatabaseConstraint>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 const DatabaseLookup& source,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 ResourceType queryLevel) const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478 assert(mainDicomTagsRegistry_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481 target.reserve(source.GetConstraintsCount());
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 for (size_t i = 0; i < source.GetConstraintsCount(); i++)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 ResourceType level;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486 DicomTagType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488 mainDicomTagsRegistry_->LookupTag(level, type, source.GetConstraint(i).GetTag());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 if (type == DicomTagType_Identifier \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 type == DicomTagType_Main)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	493 // Use the fact that patient-level tags are copied at the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 if (level == ResourceType_Patient &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 queryLevel != ResourceType_Patient)
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 level = ResourceType_Study;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 target.push_back(source.GetConstraint(i).ConvertToDatabaseConstraint(level, type));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	502 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	503 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	504
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	505
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 class StatelessDatabaseOperations::Transaction : public boost::noncopyable
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 IDatabaseWrapper& db_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511 std::unique_ptr<ITransactionContext> context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512 bool isCommitted_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 Transaction(IDatabaseWrapper& db,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 ITransactionContextFactory& factory,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 TransactionType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 db_(db),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 isCommitted_(false)
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 context_.reset(factory.Create());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 if (context_.get() == NULL)
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 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	526
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4587 diff changeset	527 transaction_.reset(db_.StartTransaction(type, *context_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 if (transaction_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	531 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	532 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	533
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 ~Transaction()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 if (!isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 transaction_->Rollback();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 {
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	544 LOG(INFO) << "Cannot rollback transaction: " << e.What();
4586 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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	549 IDatabaseWrapper::ITransaction& GetDatabaseTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	550 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	551 assert(transaction_.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	552 return *transaction_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	553 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	554
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 void Commit()
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 if (isCommitted_)
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 throw OrthancException(ErrorCode_BadSequenceOfCalls);
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 else
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 int64_t delta = context_->GetCompressedSizeDelta();
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 transaction_->Commit(delta);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 context_->Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 isCommitted_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	568 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	569 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 ITransactionContext& GetContext() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 assert(context_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 return *context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 }
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::ApplyInternal(IReadOnlyOperations* readOperations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 IReadWriteOperations* writeOperations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	581 {
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	582 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	583
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584 if ((readOperations == NULL && writeOperations == NULL) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 (readOperations != NULL && writeOperations != NULL))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	588 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 if (factory_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 throw OrthancException(ErrorCode_BadSequenceOfCalls, "No transaction context was provided");
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
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	595 unsigned int attempt = 0;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 try
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 if (readOperations != NULL)
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 /**
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 * 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	605 * 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	606 * global mutex that was protecting the database.
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607 **/
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 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	610 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	611 ReadOnlyTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 readOperations->Apply(t);
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 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 assert(writeOperations != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 Transaction transaction(db_, *factory_, TransactionType_ReadWrite);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	622 ReadWriteTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 writeOperations->Apply(t);
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 transaction.Commit();
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 return; // Success
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 (OrthancException& e)
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 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 {
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	634 if (attempt >= maxRetries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 {
5492 26877f4b306f now only logging 'Maximum transactions retries reached' as an error Alain Mazy <am@osimis.io> parents: 5466 diff changeset	636 LOG(ERROR) << "Maximum transactions retries reached " << e.GetDetails();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 {
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	641 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	642
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	643 // 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	644 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	645 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	650 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	651 }
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 StatelessDatabaseOperations::StatelessDatabaseOperations(IDatabaseWrapper& db) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 db_(db),
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	658 mainDicomTagsRegistry_(new MainDicomTagsRegistry),
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	659 maxRetries_(0)
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	660 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	661 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	662
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	663
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	664 void StatelessDatabaseOperations::FlushToDisk()
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	665 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	666 try
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	667 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	668 db_.FlushToDisk();
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	669 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	670 catch (OrthancException&)
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	671 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	672 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	673 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	675
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 void StatelessDatabaseOperations::SetTransactionContextFactory(ITransactionContextFactory* factory)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 {
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	679 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	680
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 if (factory == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 else if (factory_.get() != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 factory_.reset(factory);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	692 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	693 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	695
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	696 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	697 {
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	698 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	699 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	700 }
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	701
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	702
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 void StatelessDatabaseOperations::Apply(IReadOnlyOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 ApplyInternal(&operations, NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	706 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	707
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	708
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 void StatelessDatabaseOperations::Apply(IReadWriteOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 ApplyInternal(NULL, &operations);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714
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	715 bool StatelessDatabaseOperations::ExpandResource(ExpandedResource& target,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 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	717 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	718 const std::set<DicomTag>& requestedTags,
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	719 ExpandResourceFlags expandFlags)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 {
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	721 class Operations : public ReadOnlyOperationsT6<
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	722 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	723 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 private:
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	725 bool hasLabelsSupport_;
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	726
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 static bool LookupStringMetadata(std::string& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	730 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 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	732
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	733 if (found == metadata.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 result = found->second;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	741 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	742 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 static bool LookupIntegerMetadata(int64_t& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 std::string s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 if (!LookupStringMetadata(s, metadata, type))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	752 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	753 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	754
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757 result = boost::lexical_cast<int64_t>(s);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	761 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	762 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	763 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 public:
5526 9a431368801b cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 5523 diff changeset	768 explicit Operations(bool hasLabelsSupport) :
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	769 hasLabelsSupport_(hasLabelsSupport)
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	770 {
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	771 }
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	772
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	775 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	776 // 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	777 int64_t internalId;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 std::string parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 {
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	787 ExpandedResource& target = tuple.get<1>();
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	788 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	789
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 // Set information about the parent resource (if it exists)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 if (type == ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	792 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	793 if (!parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	794 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	795 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	799 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	800 if (parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	801 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	802 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	803 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804
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	805 target.parentId_ = parent;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	808 target.SetResource(type, tuple.get<2>());
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	809
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	810 if (expandFlags & ExpandResourceFlags_IncludeChildren)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811 {
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	812 // 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	813 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	814 }
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
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	816 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	817 {
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	818 // 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	819 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	820
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	821 switch (type)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 {
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	823 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	824 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	825 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	826
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	827 case ResourceType_Series:
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 {
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	829 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	830 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	831 {
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	832 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	833 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	834 }
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	835 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	836 {
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	837 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	838 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	839 }
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	840
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	841 break;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	843
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	844 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	845 {
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	846 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	847 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	848 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	849 {
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	850 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	851 }
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	852
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	853 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	854 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	855
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	856 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	857 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	858 {
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 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	860 }
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	861 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	862 {
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	863 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	864 }
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	865
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	866 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	867 }
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	868
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	869 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	870 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	871 }
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	872
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	873 // check the main dicom tags list has not changed since the resource was stored
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	874 target.mainDicomTagsSignature_ = DicomMap::GetDefaultMainDicomTagsSignature(type);
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	875 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	876 }
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	877
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	878 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	879 {
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	880 // read all tags from DB
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	881 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	882
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	883 // 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	884 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	885 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	886 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	887 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	888 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	889
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	890 assert(jsonMetadata["Version"].asInt() == 1);
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	891 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	892 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	893
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	894 // 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	895 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	896
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	897 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	898 {
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	899 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	900
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	901 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	902
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	903 // 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	904 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	905 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	906 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	907
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	908 while ((target.missingRequestedTags_.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	909 && currentLevel != ResourceType_Patient)
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	910 {
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	911 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	912
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	913 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	914 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	915 {
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	916 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	917 }
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	918
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	919 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	920 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	921
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	922 std::string parentMainDicomTagsSignature = DicomMap::GetDefaultMainDicomTagsSignature(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	923 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	924
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	925 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	926 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	927
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	928 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	929 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	930 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	931
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	932 // 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	933 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	934 {
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	935 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	936
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	937 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	938 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	939
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	940 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	941 }
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	942
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	943 currentInternalId = currentParentId;
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	944 }
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	945 }
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	946 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	948 if ((expandFlags & ExpandResourceFlags_IncludeLabels) &&
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	949 hasLabelsSupport_)
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	950 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	951 transaction.ListLabels(target.labels_, internalId);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	952 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	953
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	954 std::string tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	955
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	956 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_AnonymizedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 {
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	958 target.anonymizedFrom_ = tmp;
4586 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
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	961 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_ModifiedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 {
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	963 target.modifiedFrom_ = tmp;
4586 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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 if (type == ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	967 type == ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 type == ResourceType_Series)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 {
5603 b2a97dfd719f monitoring of stable resources now also considers the resource type Sebastien Jodogne <s.jodogne@gmail.com> parents: 5558 diff changeset	970 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	971
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	972 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_LastUpdate))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 {
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	974 target.lastUpdate_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 }
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	977 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	978 {
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	979 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	980 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	981
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	982 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	983 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	984 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	985 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	987 bool found;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	988 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	989 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	990 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	992
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994 void StatelessDatabaseOperations::GetAllMetadata(std::map<MetadataType, std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	997 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 class Operations : public ReadOnlyOperationsT3<std::map<MetadataType, std::string>&, const std::string&, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	999 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1001 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1002 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1003 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1004 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1007 tuple.get<2>() != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1008 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1009 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1010 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1011 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1012 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1013 transaction.GetAllMetadata(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1014 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1016 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1017
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1018 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1019 operations.Apply(*this, target, publicId, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1021
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1022
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 bool StatelessDatabaseOperations::LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1024 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 const std::string& instancePublicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 FileContentType contentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1028 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	1029 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 int64_t internalId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 ResourceType type;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1036 if (!transaction.LookupResource(internalId, type, tuple.get<3>()))
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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 }
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1040 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	1041 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1042 assert(tuple.get<1>().GetContentType() == tuple.get<4>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1044 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1051
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1052 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 Operations operations;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1054 operations.Apply(*this, found, attachment, revision, instancePublicId, contentType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1056 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 ResourceType resourceType)
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 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1064 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1071 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 operations.Apply(*this, target, resourceType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1075 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1078 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080 size_t since,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1081 uint32_t limit)
4586 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 if (limit == 0)
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 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087 else
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 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	1090 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1092 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1093 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096 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	1097 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1098 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1099
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 operations.Apply(*this, target, resourceType, since, limit);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 void StatelessDatabaseOperations::GetGlobalStatistics(/* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 /* out */ uint64_t& countPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 /* out */ uint64_t& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 /* out */ uint64_t& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 /* out */ uint64_t& countInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112 {
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	1113 // 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	1114 // 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	1115 // 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	1116 // 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	1117 class Operations : public IReadWriteOperations
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1118 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1119 private:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1120 int64_t diskSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1121 int64_t uncompressedSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1122 int64_t countPatients_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1123 int64_t countStudies_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1124 int64_t countSeries_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1125 int64_t countInstances_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1126
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1127 public:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1128 Operations() :
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1129 diskSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1130 uncompressedSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1131 countPatients_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1132 countStudies_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1133 countSeries_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1134 countInstances_(0)
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1135 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1136 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1137
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1138 void GetValues(uint64_t& diskSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1139 uint64_t& uncompressedSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1140 uint64_t& countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1141 uint64_t& countStudies,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1142 uint64_t& countSeries,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1143 uint64_t& countInstances) const
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1144 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1145 diskSize = static_cast<uint64_t>(diskSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1146 uncompressedSize = static_cast<uint64_t>(uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1147 countPatients = static_cast<uint64_t>(countPatients_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1148 countStudies = static_cast<uint64_t>(countStudies_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1149 countSeries = static_cast<uint64_t>(countSeries_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1150 countInstances = static_cast<uint64_t>(countInstances_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1151 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1152
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1153 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1154 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1155 transaction.UpdateAndGetStatistics(countPatients_, countStudies_, countSeries_, countInstances_, diskSize_, uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1156 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1157 };
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1158
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	1159 // 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	1160 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	1161 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 const Tuple& tuple) ORTHANC_OVERRIDE
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 tuple.get<0>() = transaction.GetTotalCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 tuple.get<1>() = transaction.GetTotalUncompressedSize();
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1168 tuple.get<2>() = transaction.GetResourcesCount(ResourceType_Patient);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1169 tuple.get<3>() = transaction.GetResourcesCount(ResourceType_Study);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1170 tuple.get<4>() = transaction.GetResourcesCount(ResourceType_Series);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1171 tuple.get<5>() = transaction.GetResourcesCount(ResourceType_Instance);
4586 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 };
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1174
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1175 if (GetDatabaseCapabilities().HasUpdateAndGetStatistics())
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1176 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1177 Operations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1178 Apply(operations);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1179
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1180 operations.GetValues(diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1181 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1182 else
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1183 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1184 LegacyOperations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1185 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1186 countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1187 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1189
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1190
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1191 void StatelessDatabaseOperations::GetChanges(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 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	1196 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1197 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199 const Tuple& tuple) ORTHANC_OVERRIDE
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 // 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	1202 // "GetLastChange()" involves calls to "GetPublicId()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1203
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1204 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1205 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1206 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1207 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1208
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1209 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	1210 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1211 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1213 hasLast = true;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1216 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	1217 }
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1223
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1224
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1225 void StatelessDatabaseOperations::GetChanges2(Json::Value& target,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1226 int64_t since,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1227 int64_t to,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1228 unsigned int maxResults,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1229 ChangeType changeType)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1230 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1231 class Operations : public ReadOnlyOperationsT5<Json::Value&, int64_t, int64_t, unsigned int, unsigned int>
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1232 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1233 public:
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1234 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1235 const Tuple& tuple) ORTHANC_OVERRIDE
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1236 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1237 std::list<ServerIndexChange> changes;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1238 bool done;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1239 bool hasLast = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1240 int64_t last = 0;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1241
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1242 transaction.GetChanges2(changes, done, tuple.get<1>(), tuple.get<2>(), tuple.get<3>(), static_cast<ChangeType>(tuple.get<4>()));
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1243 if (changes.empty())
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1244 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1245 last = transaction.GetLastChangeIndex();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1246 hasLast = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1247 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1248
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1249 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	1250 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1251 };
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1252
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1253 Operations operations;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1254 operations.Apply(*this, target, since, to, maxResults, changeType);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1255 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1256
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	1257
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 void StatelessDatabaseOperations::GetLastChange(Json::Value& target)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 class Operations : public ReadOnlyOperationsT1<Json::Value&>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1265 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1266 // 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	1267 // "GetLastChange()" involves calls to "GetPublicId()"
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 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 int64_t last = 0;
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 transaction.GetLastChange(changes);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1275 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1276 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277 hasLast = true;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1280 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	1281 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1282 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1283
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1284 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1285 operations.Apply(*this, target);
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
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 void StatelessDatabaseOperations::GetExportedResources(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1290 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1291 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1292 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1293 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	1294 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1295 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1296 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1297 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1298 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1299 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1300
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1301 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1302 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303 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	1304 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	1305 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1306 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1307
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1308 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1309 operations.Apply(*this, target, since, maxResults);
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
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 void StatelessDatabaseOperations::GetLastExportedResource(Json::Value& target)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315 class Operations : public ReadOnlyOperationsT1<Json::Value&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1316 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1317 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1318 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1319 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
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 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1324 transaction.GetLastExportedResource(exported);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325 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	1326 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1327 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1330 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1331 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1332
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1333
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1334 bool StatelessDatabaseOperations::IsProtectedPatient(const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1335 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1336 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1337 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1338 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1341 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1342 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1344 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1352 tuple.get<0>() = transaction.IsProtectedPatient(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1353 }
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 bool isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1358 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1359 operations.Apply(*this, isProtected, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1360 return isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1361 }
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 void StatelessDatabaseOperations::GetChildren(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1365 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1366 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1367 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	1368 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1369 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1370 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374 int64_t resource;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1375 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1376 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 else if (type == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1380 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381 // An instance cannot have a child
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1382 throw OrthancException(ErrorCode_BadParameterType);
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 else
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 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1387 transaction.GetChildrenInternalId(tmp, resource);
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 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1390
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1391 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1392 it = tmp.begin(); it != tmp.end(); ++it)
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 tuple.get<0>().push_back(transaction.GetPublicId(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1395 }
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1400 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1401 operations.Apply(*this, result, publicId);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1404
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1405 void StatelessDatabaseOperations::GetChildInstances(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1406 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1407 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1408 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	1409 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1410 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1411 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1412 const Tuple& tuple) ORTHANC_OVERRIDE
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<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1415
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1416 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1417 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1418 if (!transaction.LookupResource(top, type, tuple.get<1>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1419 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1420 throw OrthancException(ErrorCode_UnknownResource);
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 else if (type == ResourceType_Instance)
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 // 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	1425 tuple.get<0>().push_back(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1426 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1427 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1428 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1429 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1430 toExplore.push(top);
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 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1433 while (!toExplore.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1434 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1435 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1436 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1437 toExplore.pop();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1438
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1439 // TODO - This could be optimized by seeing how many
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1440 // levels "type == transaction.GetResourceType(top)" is
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1441 // above the "instances level"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1442 if (transaction.GetResourceType(resource) == ResourceType_Instance)
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 tuple.get<0>().push_back(transaction.GetPublicId(resource));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1445 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1446 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1447 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1448 // 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	1449 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1450 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1451 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1452 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1453 toExplore.push(*it);
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1456 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1457 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1458 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1459 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1460
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1461 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1462 operations.Apply(*this, result, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1463 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1464
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1465
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1466 bool StatelessDatabaseOperations::LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1467 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1468 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1469 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1470 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1471 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1472 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	1473 const std::string&, ResourceType, MetadataType>
4586 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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1476 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1477 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1478 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1479 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1480 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1481 if (!transaction.LookupResource(id, resourceType, tuple.get<3>()) \|\|
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1482 resourceType != tuple.get<4>())
4586 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 throw OrthancException(ErrorCode_UnknownResource);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1487 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1488 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	1489 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1490 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1491 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1492
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1493 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1494 Operations operations;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1495 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	1496 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1497 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1500 void StatelessDatabaseOperations::ListAvailableAttachments(std::set<FileContentType>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1501 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1502 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1503 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1504 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	1505 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1506 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1507 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1508 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1509 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1510 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1511 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1512 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1513 tuple.get<2>() != type)
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 throw OrthancException(ErrorCode_UnknownResource);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 transaction.ListAvailableAttachments(tuple.get<0>(), id);
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1522 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1525 operations.Apply(*this, target, publicId, expectedType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1526 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1529 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1530 const std::string& publicId)
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 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	1533 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1534 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1535 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1536 const Tuple& tuple) ORTHANC_OVERRIDE
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 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1539 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1540 if (!transaction.LookupResource(id, type, tuple.get<2>()))
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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1543 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1544 else
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 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1547 if (transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1548 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1549 tuple.get<1>() = transaction.GetPublicId(parentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1550 tuple.get<0>() = true;
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 else
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 tuple.get<0>() = false;
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1560 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1561 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1562 operations.Apply(*this, found, target, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1563 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1564 }
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 void StatelessDatabaseOperations::GetResourceStatistics(/* out */ ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1568 /* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1569 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1570 /* out */ unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1571 /* out */ unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1572 /* out */ unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1573 /* out */ uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574 /* out */ uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1575 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1576 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1577 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1578 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1579 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1580 ResourceType& type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1581 uint64_t& diskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1582 uint64_t& uncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1583 unsigned int& countStudies_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1584 unsigned int& countSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1585 unsigned int& countInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1586 uint64_t& dicomDiskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1587 uint64_t& dicomUncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1588 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1589
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1590 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1591 explicit Operations(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1592 uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1593 uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1594 unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1595 unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1596 unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1597 uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1598 uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1599 const std::string& publicId) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1600 type_(type),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1601 diskSize_(diskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1602 uncompressedSize_(uncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1603 countStudies_(countStudies),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1604 countSeries_(countSeries),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1605 countInstances_(countInstances),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 dicomDiskSize_(dicomDiskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607 dicomUncompressedSize_(dicomUncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1608 publicId_(publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1609 {
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 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1615 if (!transaction.LookupResource(top, type_, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1616 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1617 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1618 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1619 else
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 countInstances_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1622 countSeries_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1623 countStudies_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1624 diskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1625 uncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1626 dicomDiskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1627 dicomUncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1628
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1629 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1630 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1631
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1632 while (!toExplore.empty())
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 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1635 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1636 toExplore.pop();
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 ResourceType thisType = transaction.GetResourceType(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1639
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1640 std::set<FileContentType> f;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1641 transaction.ListAvailableAttachments(f, resource);
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 for (std::set<FileContentType>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1644 it = f.begin(); it != f.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1645 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1646 FileInfo attachment;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1647 int64_t revision; // ignored
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1648 if (transaction.LookupAttachment(attachment, revision, resource, *it))
4586 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 if (attachment.GetContentType() == FileContentType_Dicom)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1651 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1652 dicomDiskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1653 dicomUncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1654 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1655
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1656 diskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1657 uncompressedSize_ += attachment.GetUncompressedSize();
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 }
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 if (thisType == ResourceType_Instance)
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 countInstances_++;
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1666 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1667 switch (thisType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1668 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1669 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1670 countStudies_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1671 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1672
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1673 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1674 countSeries_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1675 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1676
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1677 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1678 break;
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 // 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	1682 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1683 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1684 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1685 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1686 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1687 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1688 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1689 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1690 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1691
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1692 if (countStudies_ == 0)
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 countStudies_ = 1;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1697 if (countSeries_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1698 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1699 countSeries_ = 1;
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 }
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1704
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1705 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1706 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1707 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1708 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1709
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1710
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1711 void StatelessDatabaseOperations::LookupIdentifierExact(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1712 ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1713 const DicomTag& tag,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1714 const std::string& value)
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 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1717 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1718 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1719 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1720 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
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 result.clear();
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 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1725
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1726 std::vector<DatabaseConstraint> query;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1727 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1728
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1729
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1730 class Operations : public IReadOnlyOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1733 std::vector<std::string>& result_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1734 const std::vector<DatabaseConstraint>& query_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1735 ResourceType level_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1738 Operations(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1739 const std::vector<DatabaseConstraint>& query,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1740 ResourceType level) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1741 result_(result),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1742 query_(query),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1743 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1744 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1745 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1746
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1747 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1750 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	1751 std::set<std::string> labels;
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1752 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	1753 CopyListToVector(result_, 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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1756
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1757 Operations operations(result, query, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1758 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1759 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1762 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	1763 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1764 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1765 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1766 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	1767 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1768 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1769 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1770 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1771 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1772 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1773 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	1774 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1775 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1776
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1777 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778 Operations operations;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1779 operations.Apply(*this, found, value, property, shared);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1780 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1784 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	1785 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1786 const std::string& defaultValue)
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 std::string s;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1789 if (LookupGlobalProperty(s, property, shared))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1790 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1791 return s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1792 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1793 else
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 return defaultValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1796 }
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
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 bool StatelessDatabaseOperations::GetMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1801 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1802 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1803 ResourceType levelOfInterest)
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 // 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	1806 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1807 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1808 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1809 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1810 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1811 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1812 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1813 }
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 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	1817 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1818 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1819 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1820 const Tuple& tuple) ORTHANC_OVERRIDE
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 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1823 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1824 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1825 if (!transaction.LookupResource(id, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1826 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1827 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1828 tuple.get<0>() = false;
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 else if (type == ResourceType_Study)
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 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1833 transaction.GetMainDicomTags(tmp, id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1834
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1835 switch (tuple.get<4>())
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 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1838 tmp.ExtractPatientInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1839 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1840 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1841
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1842 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 tmp.ExtractStudyInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1844 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1845 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1846
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1847 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1848 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1849 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1850 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1851 else
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 transaction.GetMainDicomTags(tuple.get<1>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1854 tuple.get<0>() = true;
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1859 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1860
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1862 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1863 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1864 return found;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1868 bool StatelessDatabaseOperations::GetAllMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1869 const std::string& instancePublicId)
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 class Operations : public ReadOnlyOperationsT3<bool&, DicomMap&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1872 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1873 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1874 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1875 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1876 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1877 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1878 int64_t instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1879 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1880 if (!transaction.LookupResource(instance, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1881 type != ResourceType_Instance)
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 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1884 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1885 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1886 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1887 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1888
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1889 transaction.GetMainDicomTags(tmp, instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1890 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1891
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1892 int64_t series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1893 if (!transaction.LookupParent(series, instance))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1894 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1895 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1896 }
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 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1899 transaction.GetMainDicomTags(tmp, series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1900 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1901
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1902 int64_t study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1903 if (!transaction.LookupParent(study, series))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1904 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1905 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1906 }
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 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1909 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1910 tuple.get<1>().Merge(tmp);
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 #ifndef NDEBUG
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1913 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1914 // 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	1915 // patient level are copied at the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1916
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1917 int64_t patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1918 if (!transaction.LookupParent(patient, study))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1919 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1920 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1921 }
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 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1924 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1925
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1926 std::set<DicomTag> patientTags;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1927 tmp.GetTags(patientTags);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1928
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1929 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1930 it = patientTags.begin(); it != patientTags.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1931 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1932 assert(tuple.get<1>().HasTag(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1933 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1934 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1935 #endif
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1936
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1937 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1938 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1939 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1940 };
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 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1943
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1944 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1945 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1946 operations.Apply(*this, found, result, instancePublicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1947 return found;
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
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 bool StatelessDatabaseOperations::LookupResourceType(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1952 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1953 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1954 class Operations : public ReadOnlyOperationsT3<bool&, ResourceType&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1955 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1956 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1957 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1958 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1961 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1962 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	1963 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1964 };
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1967 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1968 operations.Apply(*this, found, type, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1969 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1970 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1971
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1972
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1973 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1974 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1975 ResourceType parentType)
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 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	1978 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1979 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1980 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1981 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1982 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1983 ResourceType type;
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 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1986 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1987 throw OrthancException(ErrorCode_UnknownResource);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990 while (type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1991 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1993
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1994 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	1995 !transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1996 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1997 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1998 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1999 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2000
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2001 id = parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2002 type = GetParentResourceType(type);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2003 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2004
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2005 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2006 tuple.get<1>() = transaction.GetPublicId(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2007 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2008 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2009
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2010 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2011 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2012 operations.Apply(*this, found, target, publicId, parentType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2013 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2014 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2015
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2016
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2017 void StatelessDatabaseOperations::ApplyLookupResources(std::vector<std::string>& resourcesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2018 std::vector<std::string>* instancesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2019 const DatabaseLookup& lookup,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2020 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2021 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	2022 LabelsConstraint labelsConstraint,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2023 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2024 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2025 class Operations : public ReadOnlyOperationsT6<bool, const std::vector<DatabaseConstraint>&, ResourceType,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2026 const std::set<std::string>&, LabelsConstraint, size_t>
4586 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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2029 std::list<std::string> resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2030 std::list<std::string> instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2031
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2032 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2033 const std::list<std::string>& GetResourcesList() const
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 return resourcesList_;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2038 const std::list<std::string>& GetInstancesList() const
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 return instancesList_;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2043 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2044 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2047 if (tuple.get<0>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2048 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2049 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2050 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	2051 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2052 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2053 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2054 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2055 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	2056 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2057 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2058 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2059
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2060 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	2061 !db_.GetDatabaseCapabilities().HasLabelsSupport())
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	2062 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	2063 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	2064 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2065
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2066 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	2067 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2068 ServerToolbox::CheckValidLabel(*it);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2069 }
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	2070
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2071 std::vector<DatabaseConstraint> normalized;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2072 NormalizeLookup(normalized, lookup, queryLevel);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2073
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2074 Operations operations;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2075 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	2076
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2077 CopyListToVector(resourcesId, operations.GetResourcesList());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2078
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2079 if (instancesId != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2080 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2081 CopyListToVector(*instancesId, operations.GetInstancesList());
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 }
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
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	2086 bool StatelessDatabaseOperations::DeleteResource(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2087 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2088 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2089 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2090 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2091 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2092 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2093 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	2094 Json::Value& remainingAncestor_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2095 const std::string& uuid_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2096 ResourceType expectedType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2097
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2098 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	2099 Operations(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2100 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2101 ResourceType expectedType) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2102 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	2103 remainingAncestor_(remainingAncestor),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2104 uuid_(uuid),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2105 expectedType_(expectedType)
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 }
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 bool IsFound() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2110 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2111 return found_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2112 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2113
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2114 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
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 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2117 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2118 if (!transaction.LookupResource(id, type, uuid_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2119 expectedType_ != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2120 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2121 found_ = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2122 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2123 else
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 found_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2126 transaction.DeleteResource(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2127
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2128 std::string remainingPublicId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2129 ResourceType remainingLevel;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2130 if (transaction.GetTransactionContext().LookupRemainingLevel(remainingPublicId, remainingLevel))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2131 {
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	2132 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	2133 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	2134 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	2135 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	2136
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2137 { // 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	2138 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	2139 ResourcesContent content(true);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2140
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2141 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	2142 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	2143 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2144
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2145 do
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2146 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2147 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	2148 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2149 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	2150
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2151 transaction.SetResourcesContent(content);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2152 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2153 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2154 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2155 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2156 {
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	2157 remainingAncestor_["RemainingAncestor"] = Json::nullValue;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2158 }
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
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	2163 Operations operations(remainingAncestor, uuid, expectedType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2164 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2165 return operations.IsFound();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2166 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2167
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2168
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2169 void StatelessDatabaseOperations::LogExportedResource(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2170 const std::string& remoteModality)
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 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2175 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2176 const std::string& remoteModality_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2179 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2180 const std::string& remoteModality) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2181 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2182 remoteModality_(remoteModality)
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 }
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 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
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 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2189 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2190 if (!transaction.LookupResource(id, type, publicId_))
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 throw OrthancException(ErrorCode_InexistentItem);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2193 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2194
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2195 std::string patientId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2196 std::string studyInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2197 std::string seriesInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2198 std::string sopInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2199
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2200 int64_t currentId = id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2201 ResourceType currentType = type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2202
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2203 // 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	2204 bool done = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2205 while (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2206 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2207 DicomMap map;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2208 transaction.GetMainDicomTags(map, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2209
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2210 switch (currentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2211 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2212 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2213 if (map.HasTag(DICOM_TAG_PATIENT_ID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2214 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2215 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2216 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2217 done = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2218 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2219
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2220 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2221 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2222 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2223 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2224 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2225 currentType = ResourceType_Patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2226 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2227
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2228 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2229 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2230 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2231 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2232 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2233 currentType = ResourceType_Study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2234 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2235
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2236 case ResourceType_Instance:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2237 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2238 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2239 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2240 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2241 currentType = ResourceType_Series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2242 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2243
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2244 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2245 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2246 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2247
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2248 // 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	2249 // the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2250 if (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2251 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2252 bool ok = transaction.LookupParent(currentId, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2253 (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	2254 assert(ok);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2255 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2256 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2257
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2258 ExportedResource resource(-1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2259 type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2260 publicId_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2261 remoteModality_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2262 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2263 patientId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2264 studyInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2265 seriesInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2266 sopInstanceUid);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2267
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2268 transaction.LogExportedResource(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2269 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2270 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2271
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2272 Operations operations(publicId, remoteModality);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2273 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2274 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2275
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2276
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2277 void StatelessDatabaseOperations::SetProtectedPatient(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2278 bool isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2279 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2280 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2281 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2282 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2283 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2284 bool isProtected_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2285
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2286 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2287 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2288 bool isProtected) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2289 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2290 isProtected_(isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2291 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2292 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2293
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2294 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2295 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2296 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2297 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2298 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2299 if (!transaction.LookupResource(id, type, publicId_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2300 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2301 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2302 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2303 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2304 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2305 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2306 transaction.SetProtectedPatient(id, isProtected_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2307 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2308 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2309 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2310
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2311 Operations operations(publicId, isProtected);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2312 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2313
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2314 if (isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2315 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2316 LOG(INFO) << "Patient " << publicId << " has been protected";
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2319 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2320 LOG(INFO) << "Patient " << publicId << " has been unprotected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2321 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2322 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2323
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2324
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2325 void StatelessDatabaseOperations::SetMetadata(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2326 const std::string& publicId,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2327 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2328 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2329 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	2330 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	2331 const std::string& oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2332 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2333 class Operations : public IReadWriteOperations
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2334 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2335 private:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2336 int64_t& newRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2337 const std::string& publicId_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2338 MetadataType type_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2339 const std::string& value_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2340 bool hasOldRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2341 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	2342 const std::string& oldMD5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2343
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2344 public:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2345 Operations(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2346 const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2347 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2348 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2349 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	2350 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	2351 const std::string& oldMD5) :
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2352 newRevision_(newRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2353 publicId_(publicId),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2354 type_(type),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2355 value_(value),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2356 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	2357 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	2358 oldMD5_(oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2359 {
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
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2362 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2363 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2364 ResourceType resourceType;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2365 int64_t id;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2366 if (!transaction.LookupResource(id, resourceType, publicId_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2367 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2368 throw OrthancException(ErrorCode_UnknownResource);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2369 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2370 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2371 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2372 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2373 int64_t expectedRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2374 if (transaction.LookupMetadata(oldValue, expectedRevision, id, type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2375 {
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	2376 if (hasOldRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2377 {
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	2378 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	2379 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	2380
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2381 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	2382 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	2383 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2384 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	2385 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2386 }
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	2387
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2388 newRevision_ = expectedRevision + 1;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2389 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2390 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2391 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2392 // The metadata is not existing yet: Ignore "oldRevision"
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2393 // and initialize a new sequence of revisions
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2394 newRevision_ = 0;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2395 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2396
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2397 transaction.SetMetadata(id, type_, value_, newRevision_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2398
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2399 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2400 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2401 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2402 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2403 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2404 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2405 };
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2406
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	2407 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	2408 Apply(operations);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2409 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2410
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2411
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2412 void StatelessDatabaseOperations::OverwriteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2413 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2414 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2415 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2416 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	2417 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	2418 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2419
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2420
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2421 bool StatelessDatabaseOperations::DeleteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2422 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2423 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	2424 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	2425 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2426 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2427 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2428 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2429 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2430 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2431 MetadataType type_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2432 bool hasRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2433 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	2434 const std::string& md5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2435 bool found_;
4586 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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2438 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2439 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2440 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	2441 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	2442 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2443 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2444 type_(type),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2445 hasRevision_(hasRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2446 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	2447 md5_(md5),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2448 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2449 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2450 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2451
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2452 bool HasFound() const
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2453 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2454 return found_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2455 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2456
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2457 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2458 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2459 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2460 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2461 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 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 throw OrthancException(ErrorCode_UnknownResource);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2466 {
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	2467 std::string value;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2468 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	2469 if (transaction.LookupMetadata(value, expectedRevision, id, type_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2470 {
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	2471 if (hasRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2472 {
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	2473 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	2474 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	2475
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2476 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	2477 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	2478 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2479 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	2480 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2481 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2482
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2483 found_ = true;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2484 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	2485
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2486 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2487 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2488 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2489 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2490 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2491 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2492 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2493 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2494 }
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
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	2499 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2500 Apply(operations);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2501 return operations.HasFound();
4586 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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2504
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2505 uint64_t StatelessDatabaseOperations::IncrementGlobalSequence(GlobalProperty sequence,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2506 bool shared)
4586 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 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2509 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2510 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2511 uint64_t newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2512 GlobalProperty sequence_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2513 bool shared_;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2514 bool hasAtomicIncrementGlobalProperty_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2515
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2516 public:
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2517 Operations(GlobalProperty sequence,
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2518 bool shared,
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2519 bool hasAtomicIncrementGlobalProperty) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2520 newValue_(0), // Dummy initialization
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2521 sequence_(sequence),
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2522 shared_(shared),
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2523 hasAtomicIncrementGlobalProperty_(hasAtomicIncrementGlobalProperty)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2524 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2525 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2526
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2527 uint64_t GetNewValue() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2528 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2529 return newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2530 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2531
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2532 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2533 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2534 if (hasAtomicIncrementGlobalProperty_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2535 {
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	2536 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	2537 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2538 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2539 {
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	2540 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	2541
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2542 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	2543 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2544 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	2545
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2546 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	2547 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2548 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	2549 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2550 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	2551 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2552 LOG(ERROR) << "Cannot read the global sequence "
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2553 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2554 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	2555 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2556
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2557 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	2558 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2559 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	2560 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2561 // 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	2562 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	2563 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2564
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2565 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	2566 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2567 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2568 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2569
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2570 Operations operations(sequence, shared, GetDatabaseCapabilities().HasAtomicIncrementGlobalProperty());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2571 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2572 assert(operations.GetNewValue() != 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2573 return operations.GetNewValue();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2574 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2575
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2576
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2577 void StatelessDatabaseOperations::DeleteChanges()
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 class Operations : public IReadWriteOperations
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2582 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2583 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2584 transaction.ClearChanges();
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2588 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2589 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2590 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2591
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 void StatelessDatabaseOperations::DeleteExportedResources()
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 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2596 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2597 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2598 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2599 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2600 transaction.ClearExportedResources();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2601 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2602 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2603
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2604 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2605 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2606 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2607
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2608
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2609 void StatelessDatabaseOperations::SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2610 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2611 const std::string& value)
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 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2616 GlobalProperty property_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2617 bool shared_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2618 const std::string& value_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2619
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2620 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2621 Operations(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2622 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2623 const std::string& value) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2624 property_(property),
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2625 shared_(shared),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2626 value_(value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2627 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2628 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2629
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2630 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2631 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2632 transaction.SetGlobalProperty(property_, shared_, value_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2633 }
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
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2636 Operations operations(property, shared, value);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2637 Apply(operations);
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
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2641 bool StatelessDatabaseOperations::DeleteAttachment(const std::string& publicId,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2642 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2643 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	2644 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	2645 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2646 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2647 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2648 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2649 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2650 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2651 FileContentType type_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2652 bool hasRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2653 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	2654 const std::string& md5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2655 bool found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2656
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2657 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2658 Operations(const std::string& publicId,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2659 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2660 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	2661 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	2662 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2663 publicId_(publicId),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2664 type_(type),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2665 hasRevision_(hasRevision),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2666 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	2667 md5_(md5),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2668 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2669 {
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
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2672 bool HasFound() const
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2673 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2674 return found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2675 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2676
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2677 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2678 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2679 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2680 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2681 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2682 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2683 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2684 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2685 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2686 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2687 FileInfo info;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2688 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2689 if (transaction.LookupAttachment(info, expectedRevision, id, type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2690 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2691 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	2692 (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	2693 info.GetUncompressedMD5() != md5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2694 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2695 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2696 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2697
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2698 found_ = true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2699 transaction.DeleteAttachment(id, type_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2700
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2701 if (IsUserContentType(type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2702 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2703 transaction.LogChange(id, ChangeType_UpdatedAttachment, resourceType, publicId_);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2704 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2705 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2706 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2707 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2708 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2709 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2710 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2711 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2712 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2713
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	2714 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2715 Apply(operations);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2716 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2717 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2718
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2719
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2720 void StatelessDatabaseOperations::LogChange(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2721 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2722 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2723 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2724 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2725 class Operations : public IReadWriteOperations
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 private:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2728 int64_t internalId_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2729 ChangeType changeType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2730 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2731 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2732
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2733 public:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2734 Operations(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2735 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2736 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2737 ResourceType level) :
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2738 internalId_(internalId),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2739 changeType_(changeType),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2740 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2741 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2742 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2743 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2744
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2745 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2746 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2747 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2748 ResourceType type;
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2749 if (transaction.LookupResource(id, type, publicId_) &&
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2750 id == internalId_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2751 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2752 /**
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2753 * 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	2754 * same internal ID, which indicates the absence of bouncing
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2755 * (if deleting then recreating the same resource). Don't
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2756 * throw an exception if the resource has been deleted,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2757 * because this function might e.g. be called from
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2758 * "StatelessDatabaseOperations::UnstableResourcesMonitorThread()"
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2759 * (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	2760 **/
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2761 if (type == level_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2762 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2763 transaction.LogChange(id, changeType_, type, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2764 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2765 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2766 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2767 // Consistency check
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2768 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2769 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2770 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2771 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2772 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2773
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2774 Operations operations(internalId, changeType, publicId, level);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2775 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2776 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2777
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2778
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2779 static void GetMainDicomSequenceMetadataContent(std::string& result,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2780 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2781 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2782 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2783 DicomMap levelSummary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2784 DicomMap levelSequences;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2785
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2786 dicomSummary.ExtractResourceInformation(levelSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2787 levelSummary.ExtractSequences(levelSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2788
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2789 if (levelSequences.GetSize() > 0)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2790 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2791 Json::Value jsonMetadata;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2792 jsonMetadata["Version"] = 1;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2793 jsonMetadata["Sequences"] = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2794 FromDcmtkBridge::ToJson(jsonMetadata["Sequences"], levelSequences, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2795
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2796 Toolbox::WriteFastJson(result, jsonMetadata);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2797 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2798 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2799
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2800
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2801 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	2802 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2803 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2804 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2805 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2806 DicomMap summary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2807 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	2808 bool limitToThisLevelDicomTags_;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2809 ResourceType limitToLevel_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2810 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2811 DicomTransferSyntax transferSyntax_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2812
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2813 static void ReplaceMetadata(ReadWriteTransaction& transaction,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2814 int64_t instance,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2815 MetadataType metadata,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2816 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2817 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2818 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2819 int64_t oldRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2820
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2821 if (transaction.LookupMetadata(oldValue, oldRevision, instance, metadata))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2822 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2823 transaction.SetMetadata(instance, metadata, value, oldRevision + 1);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2824 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2825 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2826 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2827 transaction.SetMetadata(instance, metadata, value, 0);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2828 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2829 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2830
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2831 static void SetMainDicomSequenceMetadata(ReadWriteTransaction& transaction,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2832 int64_t instance,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2833 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2834 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2835 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2836 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2837 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2838
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2839 if (!serialized.empty())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2840 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2841 ReplaceMetadata(transaction, instance, MetadataType_MainDicomSequences, serialized);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2842 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2843 else
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2844 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2845 transaction.DeleteMetadata(instance, MetadataType_MainDicomSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2846 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2847
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2848 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2849
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2850 public:
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2851 explicit Operations(const ParsedDicomFile& dicom, bool limitToThisLevelDicomTags, ResourceType limitToLevel)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2852 : limitToThisLevelDicomTags_(limitToThisLevelDicomTags),
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2853 limitToLevel_(limitToLevel)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2854 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2855 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2856 hasher_.reset(new DicomInstanceHasher(summary_));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2857 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2858 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2859
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2860 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2861 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2862 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	2863
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2864 ResourceType type1, type2, type3, type4;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2865 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2866 !transaction.LookupResource(study, type2, hasher_->HashStudy()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2867 !transaction.LookupResource(series, type3, hasher_->HashSeries()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2868 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2869 type1 != ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2870 type2 != ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2871 type3 != ResourceType_Series \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2872 type4 != ResourceType_Instance \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2873 patient == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2874 study == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2875 series == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2876 instance == -1)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2877 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2878 throw OrthancException(ErrorCode_InternalError);
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
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2881 if (limitToThisLevelDicomTags_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2882 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2883 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	2884 int64_t resource = -1;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2885 if (limitToLevel_ == ResourceType_Patient)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2886 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2887 resource = patient;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2888 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2889 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	2890 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2891 resource = study;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2892 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2893 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	2894 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2895 resource = series;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2896 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2897 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	2898 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2899 resource = instance;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2900 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2901
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2902 transaction.ClearMainDicomTags(resource);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2903 content.AddResource(resource, limitToLevel_, summary_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2904 transaction.SetResourcesContent(content);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2905 ReplaceMetadata(transaction, resource, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(limitToLevel_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2906 }
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2907 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2908 {
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2909 transaction.ClearMainDicomTags(patient);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2910 transaction.ClearMainDicomTags(study);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2911 transaction.ClearMainDicomTags(series);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2912 transaction.ClearMainDicomTags(instance);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2913
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2914 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2915 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	2916 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	2917 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	2918 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	2919 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	2920
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2921 transaction.SetResourcesContent(content);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2922
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2923 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	2924 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	2925 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	2926 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	2927
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2928 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	2929 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	2930 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	2931 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	2932 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2933
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2934 if (hasTransferSyntax_)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2935 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2936 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	2937 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2938
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2939 const DicomValue* value;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2940 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	2941 !value->IsNull() &&
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2942 !value->IsBinary())
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2943 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2944 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	2945 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2946 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2947 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2948 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2949
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2950 Operations operations(dicom, limitToThisLevelDicomTags, limitToLevel);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2951 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2952 }
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
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2955 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxStorageSize(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2956 uint64_t addedInstanceSize)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2957 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2958 if (maximumStorageSize != 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2959 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2960 if (maximumStorageSize < addedInstanceSize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2961 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2962 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	2963 boost::lexical_cast<std::string>(addedInstanceSize) +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2964 " bytes in a storage area limited to " +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2965 boost::lexical_cast<std::string>(maximumStorageSize));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2966 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2967
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2968 if (transaction_.IsDiskSizeAbove(maximumStorageSize - addedInstanceSize))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2969 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2970 return true;
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 }
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 return false;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2975 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2976
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2977 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxPatientCount(unsigned int maximumPatientCount,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2978 const std::string& patientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2979 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2980 if (maximumPatientCount != 0)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2981 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2982 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	2983 return patientCount > maximumPatientCount;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2984 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2985
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2986 return false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2987 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2988
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2989 bool StatelessDatabaseOperations::ReadWriteTransaction::IsRecyclingNeeded(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2990 unsigned int maximumPatients,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2991 uint64_t addedInstanceSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2992 const std::string& newPatientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2993 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2994 return HasReachedMaxStorageSize(maximumStorageSize, addedInstanceSize)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2995 \|\| HasReachedMaxPatientCount(maximumPatients, newPatientId);
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2996 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2997
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2998 void StatelessDatabaseOperations::ReadWriteTransaction::Recycle(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2999 unsigned int maximumPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3000 uint64_t addedInstanceSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3001 const std::string& newPatientId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3002 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3003 // TODO - Performance: Avoid calls to "IsRecyclingNeeded()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3004
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3005 if (IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 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 // Check whether other DICOM instances from this patient are
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3008 // already stored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3009 int64_t patientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3010 bool hasPatientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3011
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3012 if (newPatientId.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3013 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3014 hasPatientToAvoid = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3015 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3016 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3017 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3018 ResourceType type;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3019 hasPatientToAvoid = transaction_.LookupResource(patientToAvoid, type, newPatientId);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3020 if (type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3021 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3022 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3023 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3026 // Iteratively select patient to remove until there is enough
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3027 // space in the DICOM store
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3028 int64_t patientToRecycle;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3029 while (true)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3030 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3031 // 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	3032 // we must avoid to recycle them
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3033 bool ok = (hasPatientToAvoid ?
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3034 transaction_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3035 transaction_.SelectPatientToRecycle(patientToRecycle));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3036
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3037 if (!ok)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3038 {
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	3039 throw OrthancException(ErrorCode_FullStorage, "Cannot recycle more patients");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3040 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3041
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3042 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	3043 transaction_.DeleteResource(patientToRecycle);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3044
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3045 if (!IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 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 // OK, we're done
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3048 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3049 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3050 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3051 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3052 }
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
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3055 void StatelessDatabaseOperations::StandaloneRecycling(MaxStorageMode maximumStorageMode,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3056 uint64_t maximumStorageSize,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3057 unsigned int maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3058 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3059 class Operations : public IReadWriteOperations
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 private:
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3062 uint64_t maximumStorageSize_;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3063 unsigned int maximumPatientCount_;
4586 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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3066 Operations(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3067 unsigned int maximumPatientCount) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3068 maximumStorageSize_(maximumStorageSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3069 maximumPatientCount_(maximumPatientCount)
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3073 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
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 transaction.Recycle(maximumStorageSize_, maximumPatientCount_, 0, "");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3076 }
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
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3079 if (maximumStorageMode == MaxStorageMode_Recycle
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3080 && (maximumStorageSize != 0 \|\| maximumPatientCount != 0))
4602 cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3081 {
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3082 Operations operations(maximumStorageSize, maximumPatientCount);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3083 Apply(operations);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3084 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3085 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3086
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3087
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3088 StoreStatus StatelessDatabaseOperations::Store(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3089 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3090 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3091 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3092 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3093 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3094 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3095 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3096 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3097 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3098 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3099 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3100 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3101 unsigned int maximumPatients,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3102 bool isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3103 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3104 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3105 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3106 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3107 StoreStatus storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3108 std::map<MetadataType, std::string>& instanceMetadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3109 const DicomMap& dicomSummary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3110 const Attachments& attachments_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3111 const MetadataMap& metadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3112 const DicomInstanceOrigin& origin_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3113 bool overwrite_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3114 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3115 DicomTransferSyntax transferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3116 bool hasPixelDataOffset_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3117 uint64_t pixelDataOffset_;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3118 ValueRepresentation pixelDataVR_;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3119 MaxStorageMode maximumStorageMode_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3120 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3121 unsigned int maximumPatientCount_;
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3122 bool isReconstruct_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3123
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3124 // Auto-computed fields
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3125 bool hasExpectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3126 int64_t expectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3127 std::string hashPatient_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3128 std::string hashStudy_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3129 std::string hashSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3130 std::string hashInstance_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3131
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3132
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3133 static void SetInstanceMetadata(ResourcesContent& content,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3134 std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3135 int64_t instance,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3136 MetadataType metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3137 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3138 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3139 content.AddMetadata(instance, metadata, value);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3140 instanceMetadata[metadata] = value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3141 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3142
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3143 static void SetMainDicomSequenceMetadata(ResourcesContent& content,
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3144 int64_t resource,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3145 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3146 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	3147 {
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3148 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3149 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3150
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3151 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	3152 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3153 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	3154 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3155 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3156
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3157 static bool ComputeExpectedNumberOfInstances(int64_t& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3158 const DicomMap& dicomSummary)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3159 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3160 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3161 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3162 const DicomValue* value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3163 const DicomValue* value2;
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 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	3166 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3167 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3168 (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	3169 !value2->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3170 !value2->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3171 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3172 // 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	3173 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	3174 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	3175 target = imagesInAcquisition * countTemporalPositions;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3176 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3177 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3178
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3179 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	3180 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3181 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3182 (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	3183 !value2->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3184 !value2->IsNull())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3185 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3186 // Support of Cardio-PET images
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3187 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	3188 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	3189 target = numberOfSlices * numberOfTimeSlices;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3190 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3191 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3192
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3193 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	3194 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3195 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3196 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3197 target = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3198 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3199 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3200 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3201 catch (OrthancException&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3202 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3203 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3204 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3205 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3206 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3207
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3208 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3209 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3210
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3211 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3212 Operations(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3213 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3214 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3215 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3216 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3217 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3218 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3219 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3220 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3221 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3222 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3223 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3224 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3225 unsigned int maximumPatientCount,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3226 bool isReconstruct) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3227 storeStatus_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3228 instanceMetadata_(instanceMetadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3229 dicomSummary_(dicomSummary),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3230 attachments_(attachments),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3231 metadata_(metadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3232 origin_(origin),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3233 overwrite_(overwrite),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3234 hasTransferSyntax_(hasTransferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3235 transferSyntax_(transferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3236 hasPixelDataOffset_(hasPixelDataOffset),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3237 pixelDataOffset_(pixelDataOffset),
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3238 pixelDataVR_(pixelDataVR),
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3239 maximumStorageMode_(maximumStorageMode),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3240 maximumStorageSize_(maximumStorageSize),
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3241 maximumPatientCount_(maximumPatientCount),
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3242 isReconstruct_(isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3243 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3244 hasExpectedInstances_ = ComputeExpectedNumberOfInstances(expectedInstances_, dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3245
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3246 instanceMetadata_.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3247
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3248 DicomInstanceHasher hasher(dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3249 hashPatient_ = hasher.HashPatient();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3250 hashStudy_ = hasher.HashStudy();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3251 hashSeries_ = hasher.HashSeries();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3252 hashInstance_ = hasher.HashInstance();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3253 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3254
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3255 StoreStatus GetStoreStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3256 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3257 return storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3258 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3259
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3260 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3261 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3262 IDatabaseWrapper::CreateInstanceResult status;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3263 int64_t instanceId;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3264
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3265 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	3266 hashStudy_, hashSeries_, hashInstance_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3267
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3268 if (isReconstruct_ && isNewInstance)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3269 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3270 // 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	3271 // 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	3272 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	3273 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3274
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3275 // 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	3276 if (!isNewInstance && !isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3277 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3278 // The instance already exists
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3279 if (overwrite_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3280 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3281 // Overwrite the old instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3282 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	3283 transaction.DeleteResource(instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3284
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3285 // 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	3286 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	3287 hashStudy_, hashSeries_, hashInstance_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3288 {
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	3289 // 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	3290 // 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	3291 // 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	3292 // 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	3293
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	3294 // 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	3295 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	3296 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3297 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3298 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3299 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3300 // 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	3301 transaction.GetAllMetadata(instanceMetadata_, instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3302 storeStatus_ = StoreStatus_AlreadyStored;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3303 return;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3304 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3305 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3306
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3307
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3308 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	3309 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3310 // 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	3311 // from instance to patient.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3312
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3313 // 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	3314 // 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	3315 // 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	3316 // 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	3317 // 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	3318 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	3319
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3320 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3321 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3322 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	3323 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3324
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3325 if (status.isNewStudy_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3326 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3327 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	3328 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3329
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3330 if (status.isNewPatient_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3331 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3332 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	3333 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3334 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3335
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3336 // 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	3337 uint64_t instanceSize = 0;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3338 for (Attachments::const_iterator it = attachments_.begin();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3339 it != attachments_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3340 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3341 instanceSize += it->GetCompressedSize();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3342 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3343
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3344 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	3345 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3346 if (maximumStorageMode_ == MaxStorageMode_Reject)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3347 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3348 if (transaction.HasReachedMaxStorageSize(maximumStorageSize_, instanceSize))
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3349 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3350 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3351 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	3352 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3353 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	3354 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3355 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3356 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	3357 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3358 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3359 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3360 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3361 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3362 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	3363 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3364 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3365
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3366 // 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	3367 for (Attachments::const_iterator it = attachments_.begin();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3368 it != attachments_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3369 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3370 if (isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3371 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3372 // 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	3373 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	3374 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3375
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3376 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	3377 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3378
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3379 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	3380
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3381 // 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	3382 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	3383 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	3384 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3385 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	3386 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3387 case ResourceType_Patient:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3388 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	3389 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3390
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3391 case ResourceType_Study:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3392 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	3393 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3394
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3395 case ResourceType_Series:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3396 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	3397 break;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3398
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3399 case ResourceType_Instance:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3400 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	3401 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	3402 break;
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 default:
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3405 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	3406 }
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
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3409 if (!isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3410 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3411 // 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	3412 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	3413 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	3414 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	3415
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3416 if (status.isNewSeries_)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 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 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	3419 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	3420 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	3421 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3422
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3423 if (status.isNewStudy_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3424 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3425 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	3426 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	3427 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	3428 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3429
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3430 if (status.isNewPatient_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3431 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3432 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	3433 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	3434 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	3435 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3436
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3437 // 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	3438 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	3439 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	3440 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	3441 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	3442
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3443 if (status.isNewSeries_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3444 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3445 if (hasExpectedInstances_)
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3446 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3447 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	3448 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	3449 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3450
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3451 // 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	3452 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	3453 origin_.GetRemoteAetC());
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3454 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3455 // 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	3456 // 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	3457 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	3458 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	3459 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	3460 origin_.GetRemoteAetC());
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3461 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	3462 EnumerationToString(origin_.GetRequestOrigin()));
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3463
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3464 std::string s;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3465
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3466 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	3467 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3468 // 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	3469 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	3470 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	3471 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3472
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3473 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	3474 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3475 // 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	3476 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	3477 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	3478 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3479
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3480 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	3481 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3482 // 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	3483 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	3484 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	3485 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3486 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3487
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3488 // 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	3489 // 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	3490
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3491 if (hasTransferSyntax_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3492 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3493 // 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	3494 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	3495 MetadataType_Instance_TransferSyntax,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3496 GetTransferSyntaxUid(transferSyntax_));
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3497 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3498
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3499 if (hasPixelDataOffset_)
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3500 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3501 // 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	3502 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	3503 MetadataType_Instance_PixelDataOffset,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3504 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	3505
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3506 // 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	3507 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	3508 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3509 // 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	3510 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	3511 MetadataType_Instance_PixelDataVR,
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3512 EnumerationToString(pixelDataVR_));
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3513 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3514 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3515
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3516 const DicomValue* value;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3517 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	3518 !value->IsNull() &&
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3519 !value->IsBinary())
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3520 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3521 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	3522 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	3523 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3524
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3525
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3526 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	3527 (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	3528 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3529 if (!value->IsNull() &&
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3530 !value->IsBinary())
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3531 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3532 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	3533 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	3534 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3535 }
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3536
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3537
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3538 transaction.SetResourcesContent(content);
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3539
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3540
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3541 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	3542 {
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3543 // 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	3544 int64_t expectedNumberOfInstances;
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3545 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	3546 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3547 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	3548 if (seriesStatus == SeriesStatus_Complete)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3549 {
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3550 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	3551 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3552 }
5635 0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3553
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3554 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	3555 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	3556 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	3557
0e16e677fe64 fixed broken /instances/../tags after reconstructing studies when IngestTranscoding has changed Alain Mazy <am@orthanc.team> parents: 5603 diff changeset	3558 // 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	3559 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	3560 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	3561 transaction.GetTransactionContext().MarkAsUnstable(ResourceType_Patient, status.patientId_, hashPatient_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3562 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3563
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3564 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	3565 storeStatus_ = StoreStatus_Success;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3566 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3567 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3568
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3569
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3570 Operations operations(instanceMetadata, dicomSummary, attachments, metadata, origin, overwrite,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3571 hasTransferSyntax, transferSyntax, hasPixelDataOffset, pixelDataOffset,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3572 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	3573
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3574 try
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3575 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3576 Apply(operations);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3577 return operations.GetStoreStatus();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3578 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3579 catch (OrthancException& e)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3580 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3581 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	3582 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3583 return StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3584 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3585 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3586 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3587 // 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	3588 throw;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3589 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3590 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3591 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3592
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3593
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3594 StoreStatus StatelessDatabaseOperations::AddAttachment(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3595 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3596 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3597 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3598 unsigned int maximumPatients,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3599 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	3600 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	3601 const std::string& oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3602 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3603 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3604 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3605 private:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3606 int64_t& newRevision_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3607 StoreStatus status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3608 const FileInfo& attachment_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3609 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3610 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3611 unsigned int maximumPatientCount_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3612 bool hasOldRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3613 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	3614 const std::string& oldMD5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3615
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3616 public:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3617 Operations(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3618 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3619 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3620 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3621 unsigned int maximumPatientCount,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3622 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	3623 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	3624 const std::string& oldMD5) :
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3625 newRevision_(newRevision),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3626 status_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3627 attachment_(attachment),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3628 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3629 maximumStorageSize_(maximumStorageSize),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3630 maximumPatientCount_(maximumPatientCount),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3631 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	3632 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	3633 oldMD5_(oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3634 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3635 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3636
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3637 StoreStatus GetStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3638 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3639 return status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3640 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3641
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3642 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3643 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3644 ResourceType resourceType;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3645 int64_t resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3646 if (!transaction.LookupResource(resourceId, resourceType, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3647 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3648 throw OrthancException(ErrorCode_InexistentItem, HttpStatus_404_NotFound);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3649 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3650 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3651 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3652 // Possibly remove previous attachment
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3653 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3654 FileInfo oldFile;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3655 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3656 if (transaction.LookupAttachment(oldFile, expectedRevision, resourceId, attachment_.GetContentType()))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3657 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3658 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	3659 (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	3660 oldFile.GetUncompressedMD5() != oldMD5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3661 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3662 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3663 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3664 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3665 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3666 newRevision_ = expectedRevision + 1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3667 transaction.DeleteAttachment(resourceId, attachment_.GetContentType());
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3668 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3669 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3670 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3671 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3672 // The attachment is not existing yet: Ignore "oldRevision"
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3673 // and initialize a new sequence of revisions
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3674 newRevision_ = 0;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3675 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3676 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3677
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3678 // Locate the patient of the target resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3679 int64_t patientId = resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3680 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3681 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3682 int64_t parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3683 if (transaction.LookupParent(parent, patientId))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3684 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3685 // We have not reached the patient level yet
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3686 patientId = parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3687 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3688 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3689 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3690 // We have reached the patient level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3691 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3692 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3693 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3694
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3695 // Possibly apply the recycling mechanism while preserving this patient
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3696 assert(transaction.GetResourceType(patientId) == ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3697 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3698 attachment_.GetCompressedSize(), transaction.GetPublicId(patientId));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3699
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3700 transaction.AddAttachment(resourceId, attachment_, newRevision_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3701
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3702 if (IsUserContentType(attachment_.GetContentType()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3703 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3704 transaction.LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3705 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3706
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3707 transaction.GetTransactionContext().SignalAttachmentsAdded(attachment_.GetCompressedSize());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3708
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3709 status_ = StoreStatus_Success;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3710 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3711 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3712 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3713
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3714
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	3715 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	3716 hasOldRevision, oldRevision, oldMD5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3717 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3718 return operations.GetStatus();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3719 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3720
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3721
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3722 void StatelessDatabaseOperations::ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3723 const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3724 ResourceType level)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3725 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3726 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	3727 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3728 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3729 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3730 const Tuple& tuple) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3731 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3732 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3733 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3734 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3735 tuple.get<2>() != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3736 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3737 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3738 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3739 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3740 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3741 transaction.ListLabels(tuple.get<0>(), id);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3742 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3743 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3744 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3745
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3746 Operations operations;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3747 operations.Apply(*this, target, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3748 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3749
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3750
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	3751 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	3752 {
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	3753 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	3754 {
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	3755 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	3756 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	3757 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	3758 {
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	3759 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	3760 }
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	3761 };
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	3762
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	3763 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	3764 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	3765 }
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	3766
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	3767
5495 4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3768 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	3769 ResourceType level,
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3770 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	3771 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3772 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	3773 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3774 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	3775 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3776 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3777
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3778
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3779 void StatelessDatabaseOperations::ModifyLabel(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3780 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3781 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3782 LabelOperation operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3783 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3784 class Operations : public IReadWriteOperations
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3785 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3786 private:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3787 const std::string& publicId_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3788 ResourceType level_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3789 const std::string& label_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3790 LabelOperation operation_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3791
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3792 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3793 Operations(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3794 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3795 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3796 LabelOperation operation) :
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3797 publicId_(publicId),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3798 level_(level),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3799 label_(label),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3800 operation_(operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3801 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3802 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3803
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3804 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3805 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3806 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3807 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3808 if (!transaction.LookupResource(id, type, publicId_) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3809 level_ != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3810 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3811 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3812 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3813 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3814 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3815 switch (operation_)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3816 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3817 case LabelOperation_Add:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3818 transaction.AddLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3819 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3820
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3821 case LabelOperation_Remove:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3822 transaction.RemoveLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3823 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3824
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3825 default:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3826 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3827 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3828 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3829 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3830 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3831
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	3832 ServerToolbox::CheckValidLabel(label);
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3833
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3834 Operations operations(publicId, level, label, operation);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3835 Apply(operations);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3836 }
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3837
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3838
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3839 bool StatelessDatabaseOperations::HasLabelsSupport()
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3840 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3841 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	3842 return db_.GetDatabaseCapabilities().HasLabelsSupport();
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3843 }
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3844
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3845 bool StatelessDatabaseOperations::HasExtendedApiV1()
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3846 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3847 boost::shared_lock<boost::shared_mutex> lock(mutex_);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3848 return db_.GetDatabaseCapabilities().HasExtendedApiV1();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	3849 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3850 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5663:3765085693e5 large-queries