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

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5324:e95caa87fed8

only store PixelDataVR metadata if needed

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sun, 25 Jun 2023 15:19:25 +0200
parents	03501a258d9e
children	176bc05f85f4 48b8dae6dc77

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
5185 0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5175 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
0ea402b4d901 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5175 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * 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	9 * 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	10 * 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	11 * License, or (at your option) any later version.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * 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	16 * General Public License for more details.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * 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	19 * 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	20 **/
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 #include "../PrecompiledHeadersServer.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "StatelessDatabaseOperations.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #ifndef NOMINMAX
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #define NOMINMAX
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 #endif
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 #include "../../../OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 #include "../../../OrthancFramework/Sources/DicomParsing/ParsedDicomFile.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32 #include "../../../OrthancFramework/Sources/Logging.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33 #include "../../../OrthancFramework/Sources/OrthancException.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "../OrthancConfiguration.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "../Search/DatabaseLookup.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36 #include "../ServerIndexChange.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37 #include "../ServerToolbox.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 #include "ResourcesContent.h"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 #include <boost/lexical_cast.hpp>
4633 37357df3dc27 fix mingw Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	41 #include <boost/thread.hpp>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 #include <boost/tuple/tuple.hpp>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43 #include <stack>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44
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 namespace Orthanc
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 namespace
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
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 * 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	52 * of the internal classes.
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	53 **/
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 template <typename Operations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	56 typename Tuple>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	57 class TupleOperationsWrapper : public StatelessDatabaseOperations::IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	58 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	59 protected:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	60 Operations& operations_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	61 const Tuple& tuple_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	63 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	64 TupleOperationsWrapper(Operations& operations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	65 const Tuple& tuple) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	66 operations_(operations),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 tuple_(tuple)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 {
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 virtual void Apply(StatelessDatabaseOperations::ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	72 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 operations_.ApplyTuple(transaction, tuple_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74 }
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 template <typename T1>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 class ReadOnlyOperationsT1 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 typedef typename boost::tuple<T1> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84 virtual ~ReadOnlyOperationsT1()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 T1 t1)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94 const Tuple tuple(t1);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95 TupleOperationsWrapper<ReadOnlyOperationsT1, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	96 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	97 }
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 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	102 typename T2>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103 class ReadOnlyOperationsT2 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	104 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	105 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106 typedef typename boost::tuple<T1, T2> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	107
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108 virtual ~ReadOnlyOperationsT2()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	113 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	114
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	115 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	117 T2 t2)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	118 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119 const Tuple tuple(t1, t2);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120 TupleOperationsWrapper<ReadOnlyOperationsT2, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	121 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	122 }
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 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	127 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128 typename T3>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	129 class ReadOnlyOperationsT3 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	132 typedef typename boost::tuple<T1, T2, T3> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 virtual ~ReadOnlyOperationsT3()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	135 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	139 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	140
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	142 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	143 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	144 T3 t3)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	145 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146 const Tuple tuple(t1, t2, t3);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147 TupleOperationsWrapper<ReadOnlyOperationsT3, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	149 }
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 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	154 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	156 typename T4>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	157 class ReadOnlyOperationsT4 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	158 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	159 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	160 typedef typename boost::tuple<T1, T2, T3, T4> Tuple;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	161
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	162 virtual ~ReadOnlyOperationsT4()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	163 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	167 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	170 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	171 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	172 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	173 T4 t4)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	174 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	175 const Tuple tuple(t1, t2, t3, t4);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	176 TupleOperationsWrapper<ReadOnlyOperationsT4, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	177 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	178 }
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 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	183 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	184 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	185 typename T4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	186 typename T5>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	187 class ReadOnlyOperationsT5 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	188 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	189 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	190 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	191
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	192 virtual ~ReadOnlyOperationsT5()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	193 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	197 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	198
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	199 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	200 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	201 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	202 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	203 T4 t4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	204 T5 t5)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	205 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	206 const Tuple tuple(t1, t2, t3, t4, t5);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	207 TupleOperationsWrapper<ReadOnlyOperationsT5, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	208 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	209 }
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 template <typename T1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	214 typename T2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	215 typename T3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 typename T4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 typename T5,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 typename T6>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	219 class ReadOnlyOperationsT6 : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	220 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 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	223
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224 virtual ~ReadOnlyOperationsT6()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 {
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 virtual void ApplyTuple(StatelessDatabaseOperations::ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 const Tuple& tuple) = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	231 void Apply(StatelessDatabaseOperations& index,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 T1 t1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	233 T2 t2,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	234 T3 t3,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	235 T4 t4,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 T5 t5,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237 T6 t6)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	239 const Tuple tuple(t1, t2, t3, t4, t5, t6);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	240 TupleOperationsWrapper<ReadOnlyOperationsT6, Tuple> wrapper(*this, tuple);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 index.Apply(wrapper);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 }
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 template <typename T>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 static void FormatLog(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249 const std::list<T>& log,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 const std::string& name,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 bool done,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253 bool hasLast,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 int64_t last)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	256 Json::Value items = Json::arrayValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 for (typename std::list<T>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	258 it = log.begin(); it != log.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	259 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	260 Json::Value item;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	261 it->Format(item);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	262 items.append(item);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	263 }
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 target = Json::objectValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	266 target[name] = items;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	267 target["Done"] = done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	268
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	269 if (!hasLast)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	270 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	271 // 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	272 if (log.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	273 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	274 last = since;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	275 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	276 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	277 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	278 last = log.back().GetSeq();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	279 }
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 target["Last"] = static_cast<int>(last);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	283 }
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 static void CopyListToVector(std::vector<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	287 const std::list<std::string>& source)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	288 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	289 target.resize(source.size());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	290
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	291 size_t pos = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	292
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	293 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	294 it = source.begin(); it != source.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	295 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	296 target[pos] = *it;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	297 pos ++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	298 }
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 class StatelessDatabaseOperations::MainDicomTagsRegistry : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	303 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	304 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	305 class TagInfo
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	306 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	307 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	308 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	309 DicomTagType type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	310
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	311 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	312 TagInfo()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	313 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	314 }
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 TagInfo(ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	317 DicomTagType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	318 level_(level),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	319 type_(type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	320 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	321 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	322
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	323 ResourceType GetLevel() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	324 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	325 return level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	326 }
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 DicomTagType GetType() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	329 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	330 return type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	331 }
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 typedef std::map<DicomTag, TagInfo> Registry;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	335
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	336
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	337 Registry registry_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	338
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	339 void LoadTags(ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	340 {
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 const DicomTag* tags = NULL;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	343 size_t size;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	344
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	345 ServerToolbox::LoadIdentifiers(tags, size, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	346
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 for (size_t i = 0; i < size; i++)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349 if (registry_.find(tags[i]) == registry_.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	350 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	351 registry_[tags[i]] = TagInfo(level, DicomTagType_Identifier);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	355 // 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	356 assert(level == ResourceType_Study &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357 (tags[i] == DICOM_TAG_PATIENT_ID \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 tags[i] == DICOM_TAG_PATIENT_NAME \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 tags[i] == DICOM_TAG_PATIENT_BIRTH_DATE));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360 }
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 {
5175 48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	365 std::set<DicomTag> tags;
48005e522bd6 start fixing thread safety issues with DicomMap Sebastien Jodogne <s.jodogne@gmail.com> parents: 5061 diff changeset	366 DicomMap::GetMainDicomTags(tags, level);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	367
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	369 tag = tags.begin(); tag != tags.end(); ++tag)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	370 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	371 if (registry_.find(*tag) == registry_.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	372 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	373 registry_[*tag] = TagInfo(level, DicomTagType_Main);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	374 }
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	380 MainDicomTagsRegistry()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	381 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	382 LoadTags(ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	383 LoadTags(ResourceType_Study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	384 LoadTags(ResourceType_Series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	385 LoadTags(ResourceType_Instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	386 }
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 void LookupTag(ResourceType& level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	389 DicomTagType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	390 const DicomTag& tag) const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	391 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	392 Registry::const_iterator it = registry_.find(tag);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	393
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	394 if (it == registry_.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	395 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	396 // Default values
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	397 level = ResourceType_Instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	398 type = DicomTagType_Generic;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	399 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	400 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	401 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	402 level = it->second.GetLevel();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	403 type = it->second.GetType();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	404 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	405 }
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 void StatelessDatabaseOperations::ReadWriteTransaction::LogChange(int64_t internalId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	410 ChangeType changeType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	411 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	412 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	413 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	414 ServerIndexChange change(changeType, resourceType, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	415
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	416 if (changeType <= ChangeType_INTERNAL_LastLogged)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	417 {
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5185 diff changeset	418 transaction_.LogChange(changeType, resourceType, internalId, publicId, change.GetDate());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	419 }
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 GetTransactionContext().SignalChange(change);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	422 }
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 SeriesStatus StatelessDatabaseOperations::ReadOnlyTransaction::GetSeriesStatus(int64_t id,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	426 int64_t expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	427 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	428 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	429 transaction_.GetChildrenMetadata(values, id, MetadataType_Instance_IndexInSeries);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	430
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	431 std::set<int64_t> instances;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	432
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	433 for (std::list<std::string>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	434 it = values.begin(); it != values.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	435 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	436 int64_t index;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	437
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	438 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	439 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	440 index = boost::lexical_cast<int64_t>(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	441 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	442 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	443 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	444 return SeriesStatus_Unknown;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	445 }
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 if (!(index > 0 && index <= expectedNumberOfInstances))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	448 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	449 // Out-of-range instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	450 return SeriesStatus_Inconsistent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	451 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	452
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	453 if (instances.find(index) != instances.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	454 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	455 // Twice the same instance index
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	456 return SeriesStatus_Inconsistent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	457 }
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 instances.insert(index);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	460 }
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 if (static_cast<int64_t>(instances.size()) == expectedNumberOfInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	463 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	464 return SeriesStatus_Complete;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	465 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	466 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	467 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	468 return SeriesStatus_Missing;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	469 }
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 void StatelessDatabaseOperations::NormalizeLookup(std::vector<DatabaseConstraint>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	474 const DatabaseLookup& source,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	475 ResourceType queryLevel) const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	476 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	477 assert(mainDicomTagsRegistry_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	478
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	479 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	480 target.reserve(source.GetConstraintsCount());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	481
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	482 for (size_t i = 0; i < source.GetConstraintsCount(); i++)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	483 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	484 ResourceType level;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	485 DicomTagType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	486
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	487 mainDicomTagsRegistry_->LookupTag(level, type, source.GetConstraint(i).GetTag());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	488
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	489 if (type == DicomTagType_Identifier \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	490 type == DicomTagType_Main)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	491 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	492 // 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	493 if (level == ResourceType_Patient &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	494 queryLevel != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	495 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	496 level = ResourceType_Study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	497 }
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 target.push_back(source.GetConstraint(i).ConvertToDatabaseConstraint(level, type));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	500 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	501 }
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 class StatelessDatabaseOperations::Transaction : public boost::noncopyable
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	506 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	507 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	508 IDatabaseWrapper& db_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	509 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	510 std::unique_ptr<ITransactionContext> context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	511 bool isCommitted_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	512
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	513 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	514 Transaction(IDatabaseWrapper& db,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	515 ITransactionContextFactory& factory,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	516 TransactionType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	517 db_(db),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	518 isCommitted_(false)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	519 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	520 context_.reset(factory.Create());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	521 if (context_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	522 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	523 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	524 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	525
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4587 diff changeset	526 transaction_.reset(db_.StartTransaction(type, *context_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	527 if (transaction_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	528 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	529 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	530 }
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 ~Transaction()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	534 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	535 if (!isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	536 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	537 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	538 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	539 transaction_->Rollback();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 {
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	543 LOG(INFO) << "Cannot rollback transaction: " << e.What();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	544 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	545 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	548 IDatabaseWrapper::ITransaction& GetDatabaseTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	549 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	550 assert(transaction_.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	551 return *transaction_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	552 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	553
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 void Commit()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 if (isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	558 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 int64_t delta = context_->GetCompressedSizeDelta();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564 transaction_->Commit(delta);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 context_->Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 isCommitted_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 }
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 ITransactionContext& GetContext() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 assert(context_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 return *context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	575 };
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 void StatelessDatabaseOperations::ApplyInternal(IReadOnlyOperations* readOperations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579 IReadWriteOperations* writeOperations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	580 {
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	581 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	582
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	583 if ((readOperations == NULL && writeOperations == NULL) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	584 (readOperations != NULL && writeOperations != NULL))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	585 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	587 }
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 if (factory_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 throw OrthancException(ErrorCode_BadSequenceOfCalls, "No transaction context was provided");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593
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	594 unsigned int attempt = 0;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	595
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	596 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	599 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	600 if (readOperations != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	601 {
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 * 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	604 * 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	605 * global mutex that was protecting the database.
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	606 **/
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	607
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	608 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	609 {
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	610 ReadOnlyTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext(), db_.HasLabelsSupport());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 readOperations->Apply(t);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	613 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	614 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 assert(writeOperations != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 Transaction transaction(db_, *factory_, TransactionType_ReadWrite);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620 {
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	621 ReadWriteTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext(), db_.HasLabelsSupport());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 writeOperations->Apply(t);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625 }
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 return; // Success
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 {
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	633 if (attempt >= maxRetries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	636 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	637 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 {
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	639 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	640
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 // 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	642 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	643 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	644 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	645 else
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 throw;
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 }
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 StatelessDatabaseOperations::StatelessDatabaseOperations(IDatabaseWrapper& db) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 db_(db),
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	656 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	657 hasFlushToDisk_(db.HasFlushToDisk()),
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	658 maxRetries_(0)
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	659 {
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 void StatelessDatabaseOperations::FlushToDisk()
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	665 try
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	666 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	667 db_.FlushToDisk();
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	668 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	669 catch (OrthancException&)
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	670 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	671 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	672 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	673 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	674
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 void StatelessDatabaseOperations::SetTransactionContextFactory(ITransactionContextFactory* factory)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 {
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	678 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	679
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 if (factory == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	681 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	682 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	683 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	684 else if (factory_.get() != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	685 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	686 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	689 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	690 factory_.reset(factory);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	691 }
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
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	695 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	696 {
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 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	698 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	699 }
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
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	702 void StatelessDatabaseOperations::Apply(IReadOnlyOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	703 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	704 ApplyInternal(&operations, NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	705 }
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 void StatelessDatabaseOperations::Apply(IReadWriteOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	710 ApplyInternal(NULL, &operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	711 }
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
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	714 bool StatelessDatabaseOperations::ExpandResource(ExpandedResource& target,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 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	716 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	717 const std::set<DicomTag>& requestedTags,
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	718 ExpandResourceFlags expandFlags)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719 {
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	720 class Operations : public ReadOnlyOperationsT6<
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	721 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	722 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725 static bool LookupStringMetadata(std::string& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	728 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	729 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	730
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	731 if (found == metadata.end())
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 return false;
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 else
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 result = found->second;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 }
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 static bool LookupIntegerMetadata(int64_t& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	746 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 std::string s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	748 if (!LookupStringMetadata(s, metadata, type))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	749 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	750 return false;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	753 try
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 result = boost::lexical_cast<int64_t>(s);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	756 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	757 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 catch (boost::bad_lexical_cast&)
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 return false;
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 }
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769 // 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	770 int64_t internalId;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 std::string parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774 type != tuple.get<3>())
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 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 {
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	780 ExpandedResource& target = tuple.get<1>();
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	781 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	782
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 // Set information about the parent resource (if it exists)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 if (type == ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 if (!parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	787 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	788 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	790 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	791 else
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
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	798 target.parentId_ = parent;
4586 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
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	801 target.SetResource(type, tuple.get<2>());
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	802
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	803 if (expandFlags & ExpandResourceFlags_IncludeChildren)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 {
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	805 // 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	806 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	807 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	808
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	809 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	810 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	811 // 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	812 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	813
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 switch (type)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815 {
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	816 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	817 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	818 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	819
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 case ResourceType_Series:
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 {
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	822 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	823 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	824 {
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 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	826 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	827 }
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	828 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	829 {
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 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	831 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	832 }
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
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 break;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	836
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	837 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	838 {
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	839 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	840 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	841 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	842 {
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	843 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	844 }
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	845
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 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	847 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	848
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 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	850 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	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 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	853 }
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 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	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 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	857 }
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
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	859 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	860 }
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	861
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	862 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	863 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	864 }
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	865
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	866 // 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	867 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	868 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	869 }
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
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	871 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	872 {
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 // read all tags from DB
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	874 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	875
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	876 // 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	877 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	878 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	879 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	880 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	881 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	882
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	883 assert(jsonMetadata["Version"].asInt() == 1);
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	884 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	885 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	886
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	887 // 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	888 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	889
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	890 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	891 {
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	892 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	893
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 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	895
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	896 // 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	897 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	898 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	899 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	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 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	902 && currentLevel != ResourceType_Patient)
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	903 {
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	904 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	905
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 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	907 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	908 {
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 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	910 }
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
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 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	913 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	914
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 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	916 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	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 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	919 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	920
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 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	922 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	923 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	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 // 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	926 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	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 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	929
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 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	931 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	932
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	933 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	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
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 currentInternalId = currentParentId;
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	937 }
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	938 }
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	939 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	940
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	941 if ((expandFlags & ExpandResourceFlags_IncludeLabels) &&
cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	942 transaction.HasLabelsSupport())
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	943 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	944 transaction.ListLabels(target.labels_, internalId);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	945 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	946
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	947 std::string tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948
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	949 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_AnonymizedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950 {
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	951 target.anonymizedFrom_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	952 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	953
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	954 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_ModifiedFrom))
4586 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 target.modifiedFrom_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	959 if (type == ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	960 type == ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	961 type == ResourceType_Series)
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.isStable_ = !transaction.GetTransactionContext().IsUnstableResource(internalId);
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	964
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	965 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_LastUpdate))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	966 {
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	967 target.lastUpdate_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	968 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	969 }
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	970 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	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 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	973 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	974
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	975 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	976 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	977 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	979
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	980 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	981 Operations operations;
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	982 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	983 return found;
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 void StatelessDatabaseOperations::GetAllMetadata(std::map<MetadataType, std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	988 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	989 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	990 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	991 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	992 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	994 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	996 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	997 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	999 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000 tuple.get<2>() != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1001 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1002 throw OrthancException(ErrorCode_UnknownResource);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1005 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006 transaction.GetAllMetadata(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1007 }
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 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1012 operations.Apply(*this, target, publicId, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1013 }
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 bool StatelessDatabaseOperations::LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1017 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1018 const std::string& instancePublicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1019 FileContentType contentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1020 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1021 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	1022 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1023 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 int64_t internalId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 ResourceType type;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1029 if (!transaction.LookupResource(internalId, type, tuple.get<3>()))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1030 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 }
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1033 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	1034 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1035 assert(tuple.get<1>().GetContentType() == tuple.get<4>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 tuple.get<0>() = true;
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1040 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1041 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1042 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1043 };
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 Operations operations;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1047 operations.Apply(*this, found, attachment, revision, instancePublicId, contentType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048 return found;
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 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053 ResourceType resourceType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, ResourceType>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1059 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1060 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>());
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1065
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1067 operations.Apply(*this, target, resourceType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1068 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1069
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 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1072 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1073 size_t since,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1074 uint32_t limit)
4586 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 if (limit == 0)
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 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082 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	1083 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1085 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089 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	1090 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1092
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1093 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 operations.Apply(*this, target, resourceType, since, limit);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096 }
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 void StatelessDatabaseOperations::GetGlobalStatistics(/* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 /* out */ uint64_t& countPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 /* out */ uint64_t& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103 /* out */ uint64_t& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 /* out */ uint64_t& countInstances)
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 class Operations : public ReadOnlyOperationsT6<uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1107 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1108 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1112 tuple.get<0>() = transaction.GetTotalCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 tuple.get<1>() = transaction.GetTotalUncompressedSize();
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1114 tuple.get<2>() = transaction.GetResourcesCount(ResourceType_Patient);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1115 tuple.get<3>() = transaction.GetResourcesCount(ResourceType_Study);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1116 tuple.get<4>() = transaction.GetResourcesCount(ResourceType_Series);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1117 tuple.get<5>() = transaction.GetResourcesCount(ResourceType_Instance);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1118 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1120
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1121 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 countStudies, countSeries, countInstances);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1125
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1126
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 void StatelessDatabaseOperations::GetChanges(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1128 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1129 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1130 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1131 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	1132 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1134 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1135 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1136 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1137 // 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	1138 // "GetLastChange()" involves calls to "GetPublicId()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1139
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1140 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1141 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1142 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1143 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1144
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1145 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	1146 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1147 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1148 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1149 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1150 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1151
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1152 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	1153 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1154 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1155
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1156 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1157 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1158 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1159
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1160
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1161 void StatelessDatabaseOperations::GetLastChange(Json::Value& target)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1162 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1163 class Operations : public ReadOnlyOperationsT1<Json::Value&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1164 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1165 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1166 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1167 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1169 // 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	1170 // "GetLastChange()" involves calls to "GetPublicId()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1171
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1172 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1173 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1174 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1175
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1176 transaction.GetLastChange(changes);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1177 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1178 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1179 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1180 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1181 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1182
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1183 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	1184 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1185 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1186
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1187 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1188 operations.Apply(*this, target);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 void StatelessDatabaseOperations::GetExportedResources(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196 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	1197 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1199 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1200 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1201 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1202 // TODO - CANDIDATE FOR "TransactionType_Implicit"
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<ExportedResource> exported;
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 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	1207 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	1208 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1209 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1210
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1211 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1212 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1213 }
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 void StatelessDatabaseOperations::GetLastExportedResource(Json::Value& target)
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 class Operations : public ReadOnlyOperationsT1<Json::Value&>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1225
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1226 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1227 transaction.GetLastExportedResource(exported);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228 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	1229 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1230 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1231
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1232 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1233 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1234 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1235
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237 bool StatelessDatabaseOperations::IsProtectedPatient(const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1238 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1239 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1240 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1241 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1247 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1248 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1250 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1251 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255 tuple.get<0>() = transaction.IsProtectedPatient(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1257 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1258 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1259
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1260 bool isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1262 operations.Apply(*this, isProtected, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 return isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1265
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1266
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1267 void StatelessDatabaseOperations::GetChildren(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1268 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270 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	1271 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 const Tuple& tuple) ORTHANC_OVERRIDE
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 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277 int64_t resource;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1278 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
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 throw OrthancException(ErrorCode_UnknownResource);
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 else if (type == ResourceType_Instance)
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 // An instance cannot have a child
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1285 throw OrthancException(ErrorCode_BadParameterType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1286 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1287 else
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 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1290 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1291
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1292 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1293
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1294 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1295 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1296 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1297 tuple.get<0>().push_back(transaction.GetPublicId(*it));
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 }
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1302
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1303 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1304 operations.Apply(*this, result, publicId);
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 void StatelessDatabaseOperations::GetChildInstances(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1309 const std::string& publicId)
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 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	1312 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1313 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315 const Tuple& tuple) ORTHANC_OVERRIDE
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 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1318
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1319 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321 if (!transaction.LookupResource(top, type, tuple.get<1>()))
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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1324 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325 else if (type == ResourceType_Instance)
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 // 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	1328 tuple.get<0>().push_back(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1329 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1330 else
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 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1333 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1334
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1335 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1336 while (!toExplore.empty())
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 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 toExplore.pop();
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 // TODO - This could be optimized by seeing how many
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 // levels "type == transaction.GetResourceType(top)" is
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1344 // above the "instances level"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 if (transaction.GetResourceType(resource) == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 tuple.get<0>().push_back(transaction.GetPublicId(resource));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 // 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	1352 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1353 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1354 it = tmp.begin(); it != tmp.end(); ++it)
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 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1357 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1358 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1359 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1360 }
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1365 operations.Apply(*this, result, 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
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 bool StatelessDatabaseOperations::LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1370 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1375 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	1376 const std::string&, ResourceType, MetadataType>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1380 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1382 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1383 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1384 if (!transaction.LookupResource(id, resourceType, tuple.get<3>()) \|\|
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1385 resourceType != tuple.get<4>())
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1386 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1387 throw OrthancException(ErrorCode_UnknownResource);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1390 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1391 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	1392 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1393 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1394 };
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1397 Operations operations;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1398 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	1399 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1400 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1401
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 void StatelessDatabaseOperations::ListAvailableAttachments(std::set<FileContentType>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1404 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1405 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1406 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1407 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	1408 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1409 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1410 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1411 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1412 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1413 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1414 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1415 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1416 tuple.get<2>() != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1417 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1418 throw OrthancException(ErrorCode_UnknownResource);
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 else
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 transaction.ListAvailableAttachments(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1423 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1424 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1425 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1428 operations.Apply(*this, target, publicId, expectedType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1429 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1430
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1431
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1432 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1433 const std::string& publicId)
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 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	1436 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1437 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1438 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1439 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1440 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1441 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1442 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1443 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1444 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1445 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1446 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1447 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1448 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1449 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1450 if (transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1451 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1452 tuple.get<1>() = transaction.GetPublicId(parentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1453 tuple.get<0>() = true;
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 else
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 tuple.get<0>() = false;
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1462
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1463 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1464 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1465 operations.Apply(*this, found, target, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1466 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1467 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1468
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1469
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1470 void StatelessDatabaseOperations::GetResourceStatistics(/* out */ ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1471 /* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1472 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1473 /* out */ unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1474 /* out */ unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1475 /* out */ unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1476 /* out */ uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1477 /* out */ uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1478 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1479 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1480 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1481 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1482 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1483 ResourceType& type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1484 uint64_t& diskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1485 uint64_t& uncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1486 unsigned int& countStudies_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1487 unsigned int& countSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1488 unsigned int& countInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1489 uint64_t& dicomDiskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1490 uint64_t& dicomUncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1491 const std::string& publicId_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1494 explicit Operations(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1495 uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1496 uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1497 unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1498 unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1499 unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1500 uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1501 uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1502 const std::string& publicId) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1503 type_(type),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1504 diskSize_(diskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1505 uncompressedSize_(uncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1506 countStudies_(countStudies),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1507 countSeries_(countSeries),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1508 countInstances_(countInstances),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1509 dicomDiskSize_(dicomDiskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1510 dicomUncompressedSize_(dicomUncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1511 publicId_(publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1512 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1513 }
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 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
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 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 if (!transaction.LookupResource(top, type_, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520 throw OrthancException(ErrorCode_UnknownResource);
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 else
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 countInstances_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1525 countSeries_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1526 countStudies_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1527 diskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1528 uncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1529 dicomDiskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1530 dicomUncompressedSize_ = 0;
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 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1533 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1534
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1535 while (!toExplore.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1536 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1537 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1538 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1539 toExplore.pop();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1540
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1541 ResourceType thisType = transaction.GetResourceType(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1542
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1543 std::set<FileContentType> f;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1544 transaction.ListAvailableAttachments(f, resource);
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 for (std::set<FileContentType>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1547 it = f.begin(); it != f.end(); ++it)
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 FileInfo attachment;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1550 int64_t revision; // ignored
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1551 if (transaction.LookupAttachment(attachment, revision, resource, *it))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1552 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1553 if (attachment.GetContentType() == FileContentType_Dicom)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1554 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1555 dicomDiskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1556 dicomUncompressedSize_ += attachment.GetUncompressedSize();
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 diskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1560 uncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1561 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1562 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1563
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1564 if (thisType == ResourceType_Instance)
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 countInstances_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1567 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1568 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1569 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1570 switch (thisType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1571 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1572 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1573 countStudies_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1575
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1576 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1577 countSeries_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1578 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1579
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1580 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1581 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1582 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1583
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1584 // 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	1585 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1586 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1587 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1588 it = tmp.begin(); it != tmp.end(); ++it)
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 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1591 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1592 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1593 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1594
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1595 if (countStudies_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1596 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1597 countStudies_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1598 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1599
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1600 if (countSeries_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1601 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1602 countSeries_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1603 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1604 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1605 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1607
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1608 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1609 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1610 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1611 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1612
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614 void StatelessDatabaseOperations::LookupIdentifierExact(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1615 ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1616 const DicomTag& tag,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1617 const std::string& value)
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 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1620 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1621 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1622 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1623 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1624
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1625 result.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1626
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1627 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
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::vector<DatabaseConstraint> query;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1630 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1633 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1634 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1635 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1636 std::vector<std::string>& result_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1637 const std::vector<DatabaseConstraint>& query_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1638 ResourceType level_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1641 Operations(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1642 const std::vector<DatabaseConstraint>& query,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1643 ResourceType level) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1644 result_(result),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1645 query_(query),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1646 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1647 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1648 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1649
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1650 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1653 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	1654 std::set<std::string> labels;
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1655 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	1656 CopyListToVector(result_, tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1657 }
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 Operations operations(result, query, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1661 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1662 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1663
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1664
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1665 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	1666 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1667 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1668 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1669 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	1670 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1671 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1672 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1673 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1674 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1675 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1676 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	1677 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1678 };
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1681 Operations operations;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1682 operations.Apply(*this, found, value, property, shared);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1683 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1684 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1685
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 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	1688 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1689 const std::string& defaultValue)
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 std::string s;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1692 if (LookupGlobalProperty(s, property, shared))
4586 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 return s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1695 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1696 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1697 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1698 return defaultValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1699 }
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 bool StatelessDatabaseOperations::GetMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1704 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1705 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1706 ResourceType levelOfInterest)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1707 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1708 // 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	1709 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1710 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1711 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1712 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1713 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1714 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1715 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1716 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1717
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1718
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1719 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	1720 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1721 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1722 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1723 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1724 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1725 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1726 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1727 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1728 if (!transaction.LookupResource(id, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1729 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1730 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1731 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1732 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1733 else if (type == ResourceType_Study)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1734 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1735 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1736 transaction.GetMainDicomTags(tmp, id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1737
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1738 switch (tuple.get<4>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1739 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1740 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1741 tmp.ExtractPatientInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1742 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1743 break;
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 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1746 tmp.ExtractStudyInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1747 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1748 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1749
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1750 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1751 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1752 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1753 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1754 else
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 transaction.GetMainDicomTags(tuple.get<1>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1757 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1758 }
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 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1763
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1764 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1765 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1766 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1767 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1768 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1769
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1770
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1771 bool StatelessDatabaseOperations::GetAllMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1772 const std::string& instancePublicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1773 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1774 class Operations : public ReadOnlyOperationsT3<bool&, DicomMap&, const std::string&>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1777 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1779 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1780 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781 int64_t instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1782 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1783 if (!transaction.LookupResource(instance, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1784 type != ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1785 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1786 tuple.get<0>() = false;
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1789 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1790 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1791
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1792 transaction.GetMainDicomTags(tmp, instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1793 tuple.get<1>().Merge(tmp);
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 int64_t series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1796 if (!transaction.LookupParent(series, instance))
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 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1799 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1800
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1801 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1802 transaction.GetMainDicomTags(tmp, series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1803 tuple.get<1>().Merge(tmp);
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 int64_t study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1806 if (!transaction.LookupParent(study, series))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1807 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1808 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1809 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1810
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1811 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1812 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1813 tuple.get<1>().Merge(tmp);
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 #ifndef NDEBUG
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1816 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1817 // 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	1818 // patient level are copied at the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1819
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1820 int64_t patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1821 if (!transaction.LookupParent(patient, study))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1822 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1823 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1824 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1825
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1826 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1827 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1828
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1829 std::set<DicomTag> patientTags;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1830 tmp.GetTags(patientTags);
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 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1833 it = patientTags.begin(); it != patientTags.end(); ++it)
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 assert(tuple.get<1>().HasTag(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1836 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1837 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1838 #endif
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1839
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1840 tuple.get<0>() = true;
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1844
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1845 result.Clear();
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1848 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1849 operations.Apply(*this, found, result, instancePublicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1850 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1851 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1854 bool StatelessDatabaseOperations::LookupResourceType(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1855 const std::string& publicId)
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 class Operations : public ReadOnlyOperationsT3<bool&, ResourceType&, const std::string&>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1860 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1862 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1863 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1864 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1865 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	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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1869 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1870 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1871 operations.Apply(*this, found, type, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1872 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1873 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1874
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1875
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1876 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1877 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1878 ResourceType parentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1879 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1880 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	1881 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1882 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1883 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1884 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1885 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1886 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1887 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1888 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1889 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1890 throw OrthancException(ErrorCode_UnknownResource);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1893 while (type != tuple.get<3>())
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 int64_t parentId;
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 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	1898 !transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1899 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1900 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1901 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1902 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1903
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1904 id = parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1905 type = GetParentResourceType(type);
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 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1909 tuple.get<1>() = transaction.GetPublicId(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1910 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1913 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1914 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1915 operations.Apply(*this, found, target, publicId, parentType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1916 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1917 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1918
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 void StatelessDatabaseOperations::ApplyLookupResources(std::vector<std::string>& resourcesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1921 std::vector<std::string>* instancesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1922 const DatabaseLookup& lookup,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1923 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1924 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	1925 LabelsConstraint labelsConstraint,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1926 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1927 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1928 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	1929 const std::set<std::string>&, LabelsConstraint, size_t>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1930 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1931 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1932 std::list<std::string> resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1933 std::list<std::string> instancesList_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1936 const std::list<std::string>& GetResourcesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1937 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1938 return resourcesList_;
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 const std::list<std::string>& GetInstancesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1942 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1943 return instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1944 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1945
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1946 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1947 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1950 if (tuple.get<0>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1951 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1952 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1953 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	1954 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1955 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1956 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1957 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1958 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	1959 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1960 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1961 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1962
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1963 if (!labels.empty() &&
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1964 !db_.HasLabelsSupport())
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1965 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	1966 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	1967 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1968
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1969 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	1970 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1971 ServerToolbox::CheckValidLabel(*it);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1972 }
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	1973
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1974 std::vector<DatabaseConstraint> normalized;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1975 NormalizeLookup(normalized, lookup, queryLevel);
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 Operations operations;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1978 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	1979
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1980 CopyListToVector(resourcesId, operations.GetResourcesList());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1981
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1982 if (instancesId != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1983 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1984 CopyListToVector(*instancesId, operations.GetInstancesList());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1985 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1988
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	1989 bool StatelessDatabaseOperations::DeleteResource(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1991 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1993 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1994 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1995 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1996 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	1997 Json::Value& remainingAncestor_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1998 const std::string& uuid_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1999 ResourceType expectedType_;
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 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	2002 Operations(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2003 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2004 ResourceType expectedType) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2005 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	2006 remainingAncestor_(remainingAncestor),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2007 uuid_(uuid),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2008 expectedType_(expectedType)
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2011
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2012 bool IsFound() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2013 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2014 return found_;
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 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2018 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2019 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2020 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2021 if (!transaction.LookupResource(id, type, uuid_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2022 expectedType_ != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2023 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2024 found_ = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2025 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2026 else
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 found_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2029 transaction.DeleteResource(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2030
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2031 std::string remainingPublicId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2032 ResourceType remainingLevel;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2033 if (transaction.GetTransactionContext().LookupRemainingLevel(remainingPublicId, remainingLevel))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2034 {
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	2035 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	2036 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	2037 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	2038 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	2039
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2040 { // 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	2041 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	2042 ResourcesContent content(true);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2043
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2044 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	2045 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	2046 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2047
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2048 do
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2049 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2050 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	2051 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2052 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	2053
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2054 transaction.SetResourcesContent(content);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2055 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2056 }
4586 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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2059 {
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	2060 remainingAncestor_["RemainingAncestor"] = Json::nullValue;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2061 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2062 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2063 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2064 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2065
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	2066 Operations operations(remainingAncestor, uuid, expectedType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2067 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2068 return operations.IsFound();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2069 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2070
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2071
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2072 void StatelessDatabaseOperations::LogExportedResource(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2073 const std::string& remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2074 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2075 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2078 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2079 const std::string& remoteModality_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2082 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2083 const std::string& remoteModality) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2084 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2085 remoteModality_(remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2086 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2087 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2088
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2089 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2090 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2091 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2092 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2093 if (!transaction.LookupResource(id, type, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2094 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2095 throw OrthancException(ErrorCode_InexistentItem);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2096 }
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 std::string patientId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2099 std::string studyInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2100 std::string seriesInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2101 std::string sopInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2102
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2103 int64_t currentId = id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2104 ResourceType currentType = type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2105
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2106 // 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	2107 bool done = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2108 while (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2109 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2110 DicomMap map;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2111 transaction.GetMainDicomTags(map, currentId);
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 switch (currentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2114 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2115 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2116 if (map.HasTag(DICOM_TAG_PATIENT_ID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2117 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2118 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2119 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2120 done = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2121 break;
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 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2124 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2125 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2126 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
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 currentType = ResourceType_Patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2129 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2130
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2131 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2132 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2133 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2134 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2135 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2136 currentType = ResourceType_Study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2137 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2138
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2139 case ResourceType_Instance:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2140 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2141 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2142 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2143 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2144 currentType = ResourceType_Series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2145 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2146
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2147 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2148 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2149 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2150
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2151 // 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	2152 // the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2153 if (!done)
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 bool ok = transaction.LookupParent(currentId, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2156 (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	2157 assert(ok);
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 ExportedResource resource(-1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2162 type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2163 publicId_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2164 remoteModality_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2165 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2166 patientId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2167 studyInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2168 seriesInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2169 sopInstanceUid);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2170
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2171 transaction.LogExportedResource(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2172 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2175 Operations operations(publicId, remoteModality);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2176 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2177 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2178
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2179
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2180 void StatelessDatabaseOperations::SetProtectedPatient(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2181 bool isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2182 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2183 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2186 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2187 bool isProtected_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2188
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2189 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2190 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2191 bool isProtected) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2192 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2193 isProtected_(isProtected)
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2196
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2197 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2198 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2199 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2200 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2201 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2202 if (!transaction.LookupResource(id, type, publicId_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2203 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2204 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2205 throw OrthancException(ErrorCode_ParameterOutOfRange);
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 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2208 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2209 transaction.SetProtectedPatient(id, isProtected_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2210 }
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2213
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2214 Operations operations(publicId, isProtected);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2215 Apply(operations);
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 if (isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2218 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2219 LOG(INFO) << "Patient " << publicId << " has been protected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2220 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2221 else
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 LOG(INFO) << "Patient " << publicId << " has been unprotected";
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2226
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2227
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2228 void StatelessDatabaseOperations::SetMetadata(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2229 const std::string& publicId,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2230 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2231 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2232 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	2233 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	2234 const std::string& oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2235 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2236 class Operations : public IReadWriteOperations
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2237 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2238 private:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2239 int64_t& newRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2240 const std::string& publicId_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2241 MetadataType type_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2242 const std::string& value_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2243 bool hasOldRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2244 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	2245 const std::string& oldMD5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2246
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2247 public:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2248 Operations(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2249 const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2250 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2251 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2252 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	2253 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	2254 const std::string& oldMD5) :
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2255 newRevision_(newRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2256 publicId_(publicId),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2257 type_(type),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2258 value_(value),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2259 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	2260 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	2261 oldMD5_(oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2262 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2263 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2264
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2265 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2266 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2267 ResourceType resourceType;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2268 int64_t id;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2269 if (!transaction.LookupResource(id, resourceType, publicId_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2270 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2271 throw OrthancException(ErrorCode_UnknownResource);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2272 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2273 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2274 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2275 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2276 int64_t expectedRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2277 if (transaction.LookupMetadata(oldValue, expectedRevision, id, type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2278 {
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	2279 if (hasOldRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2280 {
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	2281 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	2282 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	2283
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2284 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	2285 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	2286 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2287 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	2288 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2289 }
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	2290
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2291 newRevision_ = expectedRevision + 1;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2292 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2293 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2294 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2295 // The metadata is not existing yet: Ignore "oldRevision"
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2296 // and initialize a new sequence of revisions
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2297 newRevision_ = 0;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2298 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2299
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2300 transaction.SetMetadata(id, type_, value_, newRevision_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2301
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2302 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2303 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2304 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2305 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2306 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2307 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2308 };
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2309
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	2310 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	2311 Apply(operations);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2312 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2313
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2314
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2315 void StatelessDatabaseOperations::OverwriteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2316 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2317 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2318 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2319 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	2320 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	2321 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2322
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2323
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2324 bool StatelessDatabaseOperations::DeleteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2325 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2326 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	2327 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	2328 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2329 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2330 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2331 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2332 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2333 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2334 MetadataType type_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2335 bool hasRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2336 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	2337 const std::string& md5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2338 bool found_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2339
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2340 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2341 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2342 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2343 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	2344 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	2345 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2346 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2347 type_(type),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2348 hasRevision_(hasRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2349 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	2350 md5_(md5),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2351 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2352 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2353 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2354
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2355 bool HasFound() const
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2356 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2357 return found_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2358 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2359
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2360 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2361 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2362 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2363 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2364 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2365 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2366 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2367 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2368 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2369 {
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	2370 std::string value;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2371 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	2372 if (transaction.LookupMetadata(value, expectedRevision, id, type_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2373 {
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	2374 if (hasRevision_)
4623 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 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	2377 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	2378
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 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	2380 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	2381 {
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 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	2383 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2384 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2385
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2386 found_ = true;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2387 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	2388
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2389 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2390 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2391 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2392 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2393 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2394 else
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 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2397 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2398 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2399 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2400 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2401
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	2402 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2403 Apply(operations);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2404 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2405 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2406
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2407
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2408 uint64_t StatelessDatabaseOperations::IncrementGlobalSequence(GlobalProperty sequence,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2409 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2410 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2411 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2412 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2413 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2414 uint64_t newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2415 GlobalProperty sequence_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2416 bool shared_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2417
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2418 public:
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2419 Operations(GlobalProperty sequence,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2420 bool shared) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2421 newValue_(0), // Dummy initialization
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2422 sequence_(sequence),
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2423 shared_(shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2424 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2425 }
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 uint64_t GetNewValue() const
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 return newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2430 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2431
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2432 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2433 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2434 std::string oldString;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2435
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2436 if (transaction.LookupGlobalProperty(oldString, sequence_, shared_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2437 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2438 uint64_t oldValue;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2439
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2440 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2441 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2442 oldValue = boost::lexical_cast<uint64_t>(oldString);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2443 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2444 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2445 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2446 LOG(ERROR) << "Cannot read the global sequence "
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2447 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2448 oldValue = 0;
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 newValue_ = oldValue + 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2452 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2453 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2454 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2455 // Initialize the sequence at "1"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2456 newValue_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2457 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2458
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2459 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	2460 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2461 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2462
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2463 Operations operations(sequence, shared);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2464 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2465 assert(operations.GetNewValue() != 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2466 return operations.GetNewValue();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2467 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2468
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2469
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2470 void StatelessDatabaseOperations::DeleteChanges()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2471 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2472 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2473 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2474 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2475 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2476 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2477 transaction.ClearChanges();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2478 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2479 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2480
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2481 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2482 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2483 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2484
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2485
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2486 void StatelessDatabaseOperations::DeleteExportedResources()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2487 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2488 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2489 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2490 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2491 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2492 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2493 transaction.ClearExportedResources();
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2498 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2499 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2500
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2501
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2502 void StatelessDatabaseOperations::SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2503 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2504 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2505 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2506 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2509 GlobalProperty property_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2510 bool shared_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2511 const std::string& value_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2512
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2513 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2514 Operations(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2515 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2516 const std::string& value) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2517 property_(property),
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2518 shared_(shared),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2519 value_(value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2520 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2521 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2522
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2523 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2524 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2525 transaction.SetGlobalProperty(property_, shared_, value_);
4586 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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2528
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2529 Operations operations(property, shared, value);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2530 Apply(operations);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2533
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2534 bool StatelessDatabaseOperations::DeleteAttachment(const std::string& publicId,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2535 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2536 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	2537 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	2538 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2539 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2540 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2541 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2542 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2543 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2544 FileContentType type_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2545 bool hasRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2546 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	2547 const std::string& md5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2548 bool found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2549
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2550 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2551 Operations(const std::string& publicId,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2552 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2553 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	2554 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	2555 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2556 publicId_(publicId),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2557 type_(type),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2558 hasRevision_(hasRevision),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2559 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	2560 md5_(md5),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2561 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2562 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2563 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2564
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2565 bool HasFound() const
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2566 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2567 return found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2568 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2569
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2570 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2571 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2572 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2573 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2574 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2577 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2578 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2579 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2580 FileInfo info;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2581 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2582 if (transaction.LookupAttachment(info, expectedRevision, id, type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2583 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2584 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	2585 (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	2586 info.GetUncompressedMD5() != md5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2587 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2588 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2589 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2590
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2591 found_ = true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2592 transaction.DeleteAttachment(id, type_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2593
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2594 if (IsUserContentType(type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2595 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2596 transaction.LogChange(id, ChangeType_UpdatedAttachment, resourceType, publicId_);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2597 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2598 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2599 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2600 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2601 found_ = false;
4586 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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2605 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2606
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	2607 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2608 Apply(operations);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2609 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2610 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2611
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2612
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2613 void StatelessDatabaseOperations::LogChange(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2614 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2615 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2616 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2617 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2618 class Operations : public IReadWriteOperations
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 private:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2621 int64_t internalId_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2622 ChangeType changeType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2623 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2624 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2625
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2626 public:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2627 Operations(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2628 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2629 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2630 ResourceType level) :
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2631 internalId_(internalId),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2632 changeType_(changeType),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2633 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2634 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2635 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2636 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2637
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2638 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
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 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2641 ResourceType type;
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2642 if (transaction.LookupResource(id, type, publicId_) &&
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2643 id == internalId_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2644 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2645 /**
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2646 * 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	2647 * same internal ID, which indicates the absence of bouncing
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2648 * (if deleting then recreating the same resource). Don't
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2649 * throw an exception if the resource has been deleted,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2650 * because this function might e.g. be called from
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2651 * "StatelessDatabaseOperations::UnstableResourcesMonitorThread()"
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2652 * (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	2653 **/
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2654 if (type == level_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2655 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2656 transaction.LogChange(id, changeType_, type, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2657 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2658 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2659 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2660 // Consistency check
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2661 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2662 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2663 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2664 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2665 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2666
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2667 Operations operations(internalId, changeType, publicId, level);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2668 Apply(operations);
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
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2672 static void GetMainDicomSequenceMetadataContent(std::string& result,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2673 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2674 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2675 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2676 DicomMap levelSummary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2677 DicomMap levelSequences;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2678
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2679 dicomSummary.ExtractResourceInformation(levelSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2680 levelSummary.ExtractSequences(levelSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2681
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2682 if (levelSequences.GetSize() > 0)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2683 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2684 Json::Value jsonMetadata;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2685 jsonMetadata["Version"] = 1;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2686 jsonMetadata["Sequences"] = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2687 FromDcmtkBridge::ToJson(jsonMetadata["Sequences"], levelSequences, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2688
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2689 Toolbox::WriteFastJson(result, jsonMetadata);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2690 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2691 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2692
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2693
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2694 void StatelessDatabaseOperations::ReconstructInstance(const ParsedDicomFile& dicom)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2695 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2696 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2697 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2698 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2699 DicomMap summary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2700 std::unique_ptr<DicomInstanceHasher> hasher_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2701 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2702 DicomTransferSyntax transferSyntax_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2703
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2704 static void ReplaceMetadata(ReadWriteTransaction& transaction,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2705 int64_t instance,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2706 MetadataType metadata,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2707 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2708 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2709 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2710 int64_t oldRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2711
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2712 if (transaction.LookupMetadata(oldValue, oldRevision, instance, metadata))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2713 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2714 transaction.SetMetadata(instance, metadata, value, oldRevision + 1);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2715 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2716 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2717 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2718 transaction.SetMetadata(instance, metadata, value, 0);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2719 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2720 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2721
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2722 static void SetMainDicomSequenceMetadata(ReadWriteTransaction& transaction,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2723 int64_t instance,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2724 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2725 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2726 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2727 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2728 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2729
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2730 if (!serialized.empty())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2731 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2732 ReplaceMetadata(transaction, instance, MetadataType_MainDicomSequences, serialized);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2733 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2734 else
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2735 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2736 transaction.DeleteMetadata(instance, MetadataType_MainDicomSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2737 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2738
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2739 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2740
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2741 public:
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2742 explicit Operations(const ParsedDicomFile& dicom)
4586 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 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2745 hasher_.reset(new DicomInstanceHasher(summary_));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2746 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2747 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2748
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2749 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2750 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2751 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	2752
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2753 ResourceType type1, type2, type3, type4;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2754 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2755 !transaction.LookupResource(study, type2, hasher_->HashStudy()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2756 !transaction.LookupResource(series, type3, hasher_->HashSeries()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2757 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2758 type1 != ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2759 type2 != ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2760 type3 != ResourceType_Series \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2761 type4 != ResourceType_Instance \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2762 patient == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2763 study == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2764 series == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2765 instance == -1)
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 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2768 }
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 transaction.ClearMainDicomTags(patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2771 transaction.ClearMainDicomTags(study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2772 transaction.ClearMainDicomTags(series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2773 transaction.ClearMainDicomTags(instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2774
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2775 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2776 ResourcesContent content(false /* prevent the setting of metadata */);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2777 content.AddResource(patient, ResourceType_Patient, summary_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2778 content.AddResource(study, ResourceType_Study, summary_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2779 content.AddResource(series, ResourceType_Series, summary_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2780 content.AddResource(instance, ResourceType_Instance, summary_);
4934 94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2781
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2782 transaction.SetResourcesContent(content);
4934 94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2783
94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2784 ReplaceMetadata(transaction, patient, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient)); // New in Orthanc 1.11.0
94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2785 ReplaceMetadata(transaction, study, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study)); // New in Orthanc 1.11.0
94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2786 ReplaceMetadata(transaction, series, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series)); // New in Orthanc 1.11.0
94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2787 ReplaceMetadata(transaction, instance, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance)); // New in Orthanc 1.11.0
5044 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 SetMainDicomSequenceMetadata(transaction, patient, summary_, ResourceType_Patient);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2790 SetMainDicomSequenceMetadata(transaction, study, summary_, ResourceType_Study);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2791 SetMainDicomSequenceMetadata(transaction, series, summary_, ResourceType_Series);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2792 SetMainDicomSequenceMetadata(transaction, instance, summary_, ResourceType_Instance);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2793 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2794
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2795 if (hasTransferSyntax_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2796 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2797 ReplaceMetadata(transaction, instance, MetadataType_Instance_TransferSyntax, GetTransferSyntaxUid(transferSyntax_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2798 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2799
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2800 const DicomValue* value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2801 if ((value = summary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2802 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2803 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2804 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2805 ReplaceMetadata(transaction, instance, MetadataType_Instance_SopClassUid, value->GetContent());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2806 }
4934 94a7b681b340 added configuration for extra main dicom tags + save signature in metadata + show warning if inconsistent main dicom tags Alain Mazy <am@osimis.io> parents: 4932 diff changeset	2807
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2808 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2809 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2810
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2811 Operations operations(dicom);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2812 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2813 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2814
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2815
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2816 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxStorageSize(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2817 uint64_t addedInstanceSize)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2818 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2819 if (maximumStorageSize != 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2820 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2821 if (maximumStorageSize < addedInstanceSize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2822 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2823 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	2824 boost::lexical_cast<std::string>(addedInstanceSize) +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2825 " bytes in a storage area limited to " +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2826 boost::lexical_cast<std::string>(maximumStorageSize));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2827 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2828
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2829 if (transaction_.IsDiskSizeAbove(maximumStorageSize - addedInstanceSize))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2830 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2831 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2832 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2833 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2834
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2835 return false;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2836 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2837
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2838 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxPatientCount(unsigned int maximumPatientCount,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2839 const std::string& patientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2840 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2841 if (maximumPatientCount != 0)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2842 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2843 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	2844 return patientCount > maximumPatientCount;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2845 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2846
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2847 return false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2848 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2849
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2850 bool StatelessDatabaseOperations::ReadWriteTransaction::IsRecyclingNeeded(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2851 unsigned int maximumPatients,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2852 uint64_t addedInstanceSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2853 const std::string& newPatientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2854 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2855 return HasReachedMaxStorageSize(maximumStorageSize, addedInstanceSize)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2856 \|\| HasReachedMaxPatientCount(maximumPatients, newPatientId);
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2857 }
4586 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 void StatelessDatabaseOperations::ReadWriteTransaction::Recycle(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2860 unsigned int maximumPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2861 uint64_t addedInstanceSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2862 const std::string& newPatientId)
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 // TODO - Performance: Avoid calls to "IsRecyclingNeeded()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2865
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2866 if (IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2867 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2868 // Check whether other DICOM instances from this patient are
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2869 // already stored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2870 int64_t patientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2871 bool hasPatientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2872
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2873 if (newPatientId.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2874 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2875 hasPatientToAvoid = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2876 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2877 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2878 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2879 ResourceType type;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2880 hasPatientToAvoid = transaction_.LookupResource(patientToAvoid, type, newPatientId);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2881 if (type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2882 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2883 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2884 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2885 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2886
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2887 // Iteratively select patient to remove until there is enough
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2888 // space in the DICOM store
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2889 int64_t patientToRecycle;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2890 while (true)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2891 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2892 // 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	2893 // we must avoid to recycle them
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2894 bool ok = (hasPatientToAvoid ?
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2895 transaction_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2896 transaction_.SelectPatientToRecycle(patientToRecycle));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2897
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2898 if (!ok)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2899 {
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	2900 throw OrthancException(ErrorCode_FullStorage, "Cannot recycle more patients");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2901 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2902
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2903 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	2904 transaction_.DeleteResource(patientToRecycle);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2905
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2906 if (!IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2907 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2908 // OK, we're done
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2909 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2910 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2911 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2912 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2913 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2914
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2915
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2916 void StatelessDatabaseOperations::StandaloneRecycling(MaxStorageMode maximumStorageMode,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2917 uint64_t maximumStorageSize,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2918 unsigned int maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2919 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2920 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2921 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2922 private:
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2923 uint64_t maximumStorageSize_;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2924 unsigned int maximumPatientCount_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2925
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2926 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2927 Operations(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2928 unsigned int maximumPatientCount) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2929 maximumStorageSize_(maximumStorageSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2930 maximumPatientCount_(maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2931 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2932 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2933
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2934 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2935 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2936 transaction.Recycle(maximumStorageSize_, maximumPatientCount_, 0, "");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2937 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2938 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2939
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2940 if (maximumStorageMode == MaxStorageMode_Recycle
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2941 && (maximumStorageSize != 0 \|\| maximumPatientCount != 0))
4602 cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2942 {
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2943 Operations operations(maximumStorageSize, maximumPatientCount);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	2944 Apply(operations);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 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 StoreStatus StatelessDatabaseOperations::Store(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2950 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2951 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2952 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2953 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2954 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2955 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2956 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2957 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2958 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	2959 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2960 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2961 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2962 unsigned int maximumPatients,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2963 bool isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2964 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2965 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2968 StoreStatus storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2969 std::map<MetadataType, std::string>& instanceMetadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2970 const DicomMap& dicomSummary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2971 const Attachments& attachments_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2972 const MetadataMap& metadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2973 const DicomInstanceOrigin& origin_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2974 bool overwrite_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2975 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2976 DicomTransferSyntax transferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2977 bool hasPixelDataOffset_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2978 uint64_t pixelDataOffset_;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	2979 ValueRepresentation pixelDataVR_;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2980 MaxStorageMode maximumStorageMode_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2981 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2982 unsigned int maximumPatientCount_;
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	2983 bool isReconstruct_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2984
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2985 // Auto-computed fields
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2986 bool hasExpectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2987 int64_t expectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2988 std::string hashPatient_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2989 std::string hashStudy_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2990 std::string hashSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2991 std::string hashInstance_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2992
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2993
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2994 static void SetInstanceMetadata(ResourcesContent& content,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2995 std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2996 int64_t instance,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2997 MetadataType metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2998 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2999 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3000 content.AddMetadata(instance, metadata, value);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3001 instanceMetadata[metadata] = value;
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
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3004 static void SetMainDicomSequenceMetadata(ResourcesContent& content,
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3005 int64_t resource,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3006 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3007 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	3008 {
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3009 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3010 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3011
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3012 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	3013 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3014 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	3015 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3016 }
4586 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 static bool ComputeExpectedNumberOfInstances(int64_t& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3019 const DicomMap& dicomSummary)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3020 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3021 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3022 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3023 const DicomValue* value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3024 const DicomValue* value2;
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 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	3027 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3028 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3029 (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	3030 !value2->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3031 !value2->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3032 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3033 // 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	3034 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	3035 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	3036 target = imagesInAcquisition * countTemporalPositions;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3037 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3038 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3039
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3040 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	3041 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3042 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3043 (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	3044 !value2->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3045 !value2->IsNull())
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 // Support of Cardio-PET images
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3048 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	3049 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	3050 target = numberOfSlices * numberOfTimeSlices;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3051 return (target > 0);
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 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	3055 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3056 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3057 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3058 target = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3059 return (target > 0);
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3062 catch (OrthancException&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3063 {
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 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3066 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3067 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3068
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3069 return false;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3073 Operations(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3074 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3075 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3076 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3077 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3078 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3079 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3080 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3081 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3082 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3083 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3084 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3085 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3086 unsigned int maximumPatientCount,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3087 bool isReconstruct) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3088 storeStatus_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3089 instanceMetadata_(instanceMetadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3090 dicomSummary_(dicomSummary),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3091 attachments_(attachments),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3092 metadata_(metadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3093 origin_(origin),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3094 overwrite_(overwrite),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3095 hasTransferSyntax_(hasTransferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3096 transferSyntax_(transferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3097 hasPixelDataOffset_(hasPixelDataOffset),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3098 pixelDataOffset_(pixelDataOffset),
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3099 pixelDataVR_(pixelDataVR),
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3100 maximumStorageMode_(maximumStorageMode),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3101 maximumStorageSize_(maximumStorageSize),
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3102 maximumPatientCount_(maximumPatientCount),
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3103 isReconstruct_(isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3104 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3105 hasExpectedInstances_ = ComputeExpectedNumberOfInstances(expectedInstances_, dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3106
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3107 instanceMetadata_.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3108
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3109 DicomInstanceHasher hasher(dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3110 hashPatient_ = hasher.HashPatient();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3111 hashStudy_ = hasher.HashStudy();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3112 hashSeries_ = hasher.HashSeries();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3113 hashInstance_ = hasher.HashInstance();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3114 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3115
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3116 StoreStatus GetStoreStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3117 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3118 return storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3119 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3120
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3121 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3122 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3123 IDatabaseWrapper::CreateInstanceResult status;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3124 int64_t instanceId;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3125
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3126 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	3127 hashStudy_, hashSeries_, hashInstance_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3128
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3129 if (isReconstruct_ && isNewInstance)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3130 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3131 // 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	3132 // 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	3133 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	3134 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3135
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3136 // 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	3137 if (!isNewInstance && !isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3138 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3139 // The instance already exists
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3140 if (overwrite_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3141 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3142 // Overwrite the old instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3143 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	3144 transaction.DeleteResource(instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3145
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3146 // 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	3147 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	3148 hashStudy_, hashSeries_, hashInstance_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3149 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3150 throw OrthancException(ErrorCode_InternalError, "No new instance while overwriting; this should not happen.");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3151 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3152 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3153 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3154 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3155 // 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	3156 transaction.GetAllMetadata(instanceMetadata_, instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3157 storeStatus_ = StoreStatus_AlreadyStored;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3158 return;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3159 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3160 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3161
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3162
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3163 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	3164 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3165 // 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	3166 // from instance to patient.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3167
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3168 // 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	3169 // 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	3170 // 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	3171 // 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	3172 // 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	3173 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	3174
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3175 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3176 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3177 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	3178 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3179
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3180 if (status.isNewStudy_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3181 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3182 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	3183 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3184
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3185 if (status.isNewPatient_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3186 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3187 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	3188 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3189 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3190
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3191 // 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	3192 uint64_t instanceSize = 0;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3193 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	3194 it != attachments_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3195 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3196 instanceSize += it->GetCompressedSize();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3197 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3198
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3199 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	3200 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3201 if (maximumStorageMode_ == MaxStorageMode_Reject)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3202 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3203 if (transaction.HasReachedMaxStorageSize(maximumStorageSize_, instanceSize))
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3204 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3205 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3206 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	3207 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3208 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	3209 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3210 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3211 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	3212 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3213 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3214 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3215 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3216 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3217 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	3218 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3219 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3220
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3221 // 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	3222 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	3223 it != attachments_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3224 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3225 if (isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3226 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3227 // 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	3228 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	3229 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3230
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3231 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	3232 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3233
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3234 if (!isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3235 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3236 ResourcesContent content(true /* new resource, metadata can be set */);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3237
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3238 // Attach the user-specified metadata (in case of reconstruction, metadata_ contains all past metadata, including the system ones we want to keep)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3239 for (MetadataMap::const_iterator
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3240 it = metadata_.begin(); it != metadata_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3241 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3242 switch (it->first.first)
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3243 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3244 case ResourceType_Patient:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3245 content.AddMetadata(status.patientId_, it->first.second, it->second);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3246 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3247
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3248 case ResourceType_Study:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3249 content.AddMetadata(status.studyId_, it->first.second, it->second);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3250 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3251
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3252 case ResourceType_Series:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3253 content.AddMetadata(status.seriesId_, it->first.second, it->second);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3254 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3255
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3256 case ResourceType_Instance:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3257 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3258 it->first.second, it->second);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3259 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3260
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3261 default:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3262 throw OrthancException(ErrorCode_ParameterOutOfRange);
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3263 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3264 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3265
5224 feba2b0e91bc Fix a crash in /tools/reconstruct triggered by the Housekeeper plugin when only changing the StorageCompression. Alain Mazy <am@osimis.io> parents: 5185 diff changeset	3266 if (!isReconstruct_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3267 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3268 // Populate the tags of the newly-created resources
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3269 content.AddResource(instanceId, ResourceType_Instance, dicomSummary_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3270 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance)); // New in Orthanc 1.11.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3271 SetMainDicomSequenceMetadata(content, instanceId, dicomSummary_, ResourceType_Instance); // new in Orthanc 1.11.1
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3272
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3273 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3274 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3275 content.AddResource(status.seriesId_, ResourceType_Series, dicomSummary_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3276 content.AddMetadata(status.seriesId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series)); // New in Orthanc 1.11.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3277 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	3278 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3279
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3280 if (status.isNewStudy_)
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3281 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3282 content.AddResource(status.studyId_, ResourceType_Study, dicomSummary_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3283 content.AddMetadata(status.studyId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study)); // New in Orthanc 1.11.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3284 SetMainDicomSequenceMetadata(content, status.studyId_, dicomSummary_, ResourceType_Study); // new in Orthanc 1.11.1
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3285 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3286
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3287 if (status.isNewPatient_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3288 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3289 content.AddResource(status.patientId_, ResourceType_Patient, dicomSummary_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3290 content.AddMetadata(status.patientId_, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient)); // New in Orthanc 1.11.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3291 SetMainDicomSequenceMetadata(content, status.patientId_, dicomSummary_, ResourceType_Patient); // new in Orthanc 1.11.1
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3292 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3293
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3294 // Attach the auto-computed metadata for the patient/study/series levels
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3295 std::string now = SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3296 content.AddMetadata(status.seriesId_, MetadataType_LastUpdate, now);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3297 content.AddMetadata(status.studyId_, MetadataType_LastUpdate, now);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3298 content.AddMetadata(status.patientId_, MetadataType_LastUpdate, now);
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 if (status.isNewSeries_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3301 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3302 if (hasExpectedInstances_)
5224 feba2b0e91bc Fix a crash in /tools/reconstruct triggered by the Housekeeper plugin when only changing the StorageCompression. Alain Mazy <am@osimis.io> parents: 5185 diff changeset	3303 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3304 content.AddMetadata(status.seriesId_, MetadataType_Series_ExpectedNumberOfInstances,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3305 boost::lexical_cast<std::string>(expectedInstances_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3306 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3307
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3308 // New in Orthanc 1.9.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3309 content.AddMetadata(status.seriesId_, MetadataType_RemoteAet,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3310 origin_.GetRemoteAetC());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3311 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3312 // Attach the auto-computed metadata for the instance level,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3313 // reflecting these additions into the input metadata map
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3314 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3315 MetadataType_Instance_ReceptionDate, now);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3316 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_RemoteAet,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3317 origin_.GetRemoteAetC());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3318 SetInstanceMetadata(content, instanceMetadata_, instanceId, MetadataType_Instance_Origin,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3319 EnumerationToString(origin_.GetRequestOrigin()));
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3320
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3321 std::string s;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3322
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3323 if (origin_.LookupRemoteIp(s))
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 // New in Orthanc 1.4.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3326 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3327 MetadataType_Instance_RemoteIp, s);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3328 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3329
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3330 if (origin_.LookupCalledAet(s))
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 // New in Orthanc 1.4.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3333 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3334 MetadataType_Instance_CalledAet, s);
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
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3337 if (origin_.LookupHttpUsername(s))
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3338 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3339 // New in Orthanc 1.4.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3340 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3341 MetadataType_Instance_HttpUsername, s);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3342 }
5296 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
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3345 // Following metadatas are also updated if reconstructing the instance.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3346 // They might be missing since they have been introduced along Orthanc versions.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3347
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3348 if (hasTransferSyntax_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3349 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3350 // New in Orthanc 1.2.0
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3351 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3352 MetadataType_Instance_TransferSyntax,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3353 GetTransferSyntaxUid(transferSyntax_));
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
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3356 if (hasPixelDataOffset_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3357 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3358 // New in Orthanc 1.9.1
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3359 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3360 MetadataType_Instance_PixelDataOffset,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3361 boost::lexical_cast<std::string>(pixelDataOffset_));
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3362
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3363 // New in Orthanc 1.12.1
5324 e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3364 if (dicomSummary_.GuessPixelDataValueRepresentation(transferSyntax_) != pixelDataVR_)
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3365 {
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3366 // Store the VR of pixel data if it doesn't comply with the standard
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3367 SetInstanceMetadata(content, instanceMetadata_, instanceId,
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3368 MetadataType_Instance_PixelDataVR,
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3369 EnumerationToString(pixelDataVR_));
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3370 }
5296 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
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3373 const DicomValue* value;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3374 if ((value = dicomSummary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3375 !value->IsNull() &&
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3376 !value->IsBinary())
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 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3379 MetadataType_Instance_SopClassUid, value->GetContent());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3380 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3381
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3382
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3383 if ((value = dicomSummary_.TestAndGetValue(DICOM_TAG_INSTANCE_NUMBER)) != NULL \|\|
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3384 (value = dicomSummary_.TestAndGetValue(DICOM_TAG_IMAGE_INDEX)) != NULL)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3385 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3386 if (!value->IsNull() &&
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3387 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3388 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3389 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3390 MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3391 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3392 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3393
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3394
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3395 transaction.SetResourcesContent(content);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3396 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3397
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3398
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3399 // Check whether the series of this new instance is now completed
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3400 int64_t expectedNumberOfInstances;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3401 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3402 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3403 SeriesStatus seriesStatus = transaction.GetSeriesStatus(status.seriesId_, expectedNumberOfInstances);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3404 if (seriesStatus == SeriesStatus_Complete)
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	3405 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3406 transaction.LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries_);
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	3407 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 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
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3410 transaction.LogChange(status.seriesId_, ChangeType_NewChildInstance, ResourceType_Series, hashSeries_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3411 transaction.LogChange(status.studyId_, ChangeType_NewChildInstance, ResourceType_Study, hashStudy_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3412 transaction.LogChange(status.patientId_, ChangeType_NewChildInstance, ResourceType_Patient, hashPatient_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3413
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3414 // Mark the parent resources of this instance as unstable
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3415 transaction.GetTransactionContext().MarkAsUnstable(status.seriesId_, ResourceType_Series, hashSeries_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3416 transaction.GetTransactionContext().MarkAsUnstable(status.studyId_, ResourceType_Study, hashStudy_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3417 transaction.GetTransactionContext().MarkAsUnstable(status.patientId_, ResourceType_Patient, hashPatient_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3418 transaction.GetTransactionContext().SignalAttachmentsAdded(instanceSize);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3419
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3420 storeStatus_ = StoreStatus_Success;
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3423
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3424
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3425 Operations operations(instanceMetadata, dicomSummary, attachments, metadata, origin, overwrite,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3426 hasTransferSyntax, transferSyntax, hasPixelDataOffset, pixelDataOffset,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3427 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	3428
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3429 try
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3430 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3431 Apply(operations);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3432 return operations.GetStoreStatus();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3433 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3434 catch (OrthancException& e)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3435 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3436 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	3437 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3438 return StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3439 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3440 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3441 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3442 // 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	3443 throw;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3444 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3445 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3446 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3447
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3448
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3449 StoreStatus StatelessDatabaseOperations::AddAttachment(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3450 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3451 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3452 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3453 unsigned int maximumPatients,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3454 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	3455 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	3456 const std::string& oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3457 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3458 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3459 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3460 private:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3461 int64_t& newRevision_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3462 StoreStatus status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3463 const FileInfo& attachment_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3464 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3465 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3466 unsigned int maximumPatientCount_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3467 bool hasOldRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3468 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	3469 const std::string& oldMD5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3470
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3471 public:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3472 Operations(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3473 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3474 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3475 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3476 unsigned int maximumPatientCount,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3477 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	3478 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	3479 const std::string& oldMD5) :
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3480 newRevision_(newRevision),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3481 status_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3482 attachment_(attachment),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3483 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3484 maximumStorageSize_(maximumStorageSize),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3485 maximumPatientCount_(maximumPatientCount),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3486 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	3487 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	3488 oldMD5_(oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3489 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3490 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3491
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3492 StoreStatus GetStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3493 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3494 return status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3495 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3496
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3497 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3498 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3499 ResourceType resourceType;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3500 int64_t resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3501 if (!transaction.LookupResource(resourceId, resourceType, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3502 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3503 throw OrthancException(ErrorCode_InexistentItem, HttpStatus_404_NotFound);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3504 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3505 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3506 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3507 // Possibly remove previous attachment
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3508 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3509 FileInfo oldFile;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3510 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3511 if (transaction.LookupAttachment(oldFile, expectedRevision, resourceId, attachment_.GetContentType()))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3512 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3513 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	3514 (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	3515 oldFile.GetUncompressedMD5() != oldMD5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3516 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3517 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3518 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3519 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3520 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3521 newRevision_ = expectedRevision + 1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3522 transaction.DeleteAttachment(resourceId, attachment_.GetContentType());
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3523 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3524 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3525 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3526 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3527 // The attachment is not existing yet: Ignore "oldRevision"
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3528 // and initialize a new sequence of revisions
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3529 newRevision_ = 0;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3530 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3531 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3532
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3533 // Locate the patient of the target resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3534 int64_t patientId = resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3535 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3536 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3537 int64_t parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3538 if (transaction.LookupParent(parent, patientId))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3539 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3540 // We have not reached the patient level yet
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3541 patientId = parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3542 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3543 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3544 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3545 // We have reached the patient level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3546 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3547 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3548 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3549
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3550 // Possibly apply the recycling mechanism while preserving this patient
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3551 assert(transaction.GetResourceType(patientId) == ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3552 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3553 attachment_.GetCompressedSize(), transaction.GetPublicId(patientId));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3554
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3555 transaction.AddAttachment(resourceId, attachment_, newRevision_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3556
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3557 if (IsUserContentType(attachment_.GetContentType()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3558 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3559 transaction.LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3560 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3561
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3562 transaction.GetTransactionContext().SignalAttachmentsAdded(attachment_.GetCompressedSize());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3563
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3564 status_ = StoreStatus_Success;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3565 }
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
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	3570 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	3571 hasOldRevision, oldRevision, oldMD5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3572 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3573 return operations.GetStatus();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3574 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3575
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3576
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3577 void StatelessDatabaseOperations::ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3578 const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3579 ResourceType level)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3580 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3581 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	3582 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3583 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3584 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3585 const Tuple& tuple) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3586 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3587 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3588 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3589 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3590 tuple.get<2>() != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3591 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3592 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3593 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3594 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3595 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3596 transaction.ListLabels(tuple.get<0>(), id);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3597 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3598 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3599 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3600
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3601 Operations operations;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3602 operations.Apply(*this, target, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3603 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3604
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3605
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	3606 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	3607 {
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	3608 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	3609 {
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	3610 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	3611 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	3612 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	3613 {
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	3614 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	3615 }
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	3616 };
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	3617
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	3618 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	3619 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	3620 }
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3621
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3622
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3623 void StatelessDatabaseOperations::ModifyLabel(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3624 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3625 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3626 LabelOperation operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3627 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3628 class Operations : public IReadWriteOperations
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3629 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3630 private:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3631 const std::string& publicId_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3632 ResourceType level_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3633 const std::string& label_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3634 LabelOperation operation_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3635
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3636 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3637 Operations(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3638 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3639 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3640 LabelOperation operation) :
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3641 publicId_(publicId),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3642 level_(level),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3643 label_(label),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3644 operation_(operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3645 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3646 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3647
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3648 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3649 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3650 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3651 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3652 if (!transaction.LookupResource(id, type, publicId_) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3653 level_ != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3654 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3655 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3656 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3657 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3658 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3659 switch (operation_)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3660 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3661 case LabelOperation_Add:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3662 transaction.AddLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3663 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3664
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3665 case LabelOperation_Remove:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3666 transaction.RemoveLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3667 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3668
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3669 default:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3670 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3671 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3672 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3673 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3674 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3675
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	3676 ServerToolbox::CheckValidLabel(label);
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3677
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3678 Operations operations(publicId, level, label, operation);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3679 Apply(operations);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3680 }
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3681
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3682
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3683 bool StatelessDatabaseOperations::HasLabelsSupport()
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3684 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3685 boost::shared_lock<boost::shared_mutex> lock(mutex_);
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3686 return db_.HasLabelsSupport();
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3687 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3688 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5324:e95caa87fed8