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

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5583:74cc31c8db2b find-refactoring

removed FindResponse::Item::responseContent_

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 27 Apr 2024 22:15:37 +0200
parents	17da828f9443
children	fc3914c07dd3

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
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5324 diff changeset	5 * Copyright (C) 2017-2024 Osimis S.A., Belgium
48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5324 diff changeset	6 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	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
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	504 void StatelessDatabaseOperations::NormalizeLookup(std::vector<DatabaseConstraint>& target,
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	505 const FindRequest& findRequest) const
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	506 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	507 assert(mainDicomTagsRegistry_.get() != NULL);
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	508
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	509 target.clear();
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	510 target.reserve(findRequest.GetDicomTagConstraintsCount());
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	511
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	512 for (size_t i = 0; i < findRequest.GetDicomTagConstraintsCount(); i++)
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	513 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	514 ResourceType level;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	515 DicomTagType type;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	516
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	517 mainDicomTagsRegistry_->LookupTag(level, type, findRequest.GetDicomTagConstraint(i).GetTag());
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	518
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	519 if (type == DicomTagType_Identifier \|\|
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	520 type == DicomTagType_Main)
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	521 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	522 // Use the fact that patient-level tags are copied at the study level
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	523 if (level == ResourceType_Patient &&
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	524 findRequest.GetLevel() != ResourceType_Patient)
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	525 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	526 level = ResourceType_Study;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	527 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	528
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	529 target.push_back(findRequest.GetDicomTagConstraint(i).ConvertToDatabaseConstraint(level, type));
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	530 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	531 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	532
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	533 // TODO-FIND: add metadata constraints
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	534 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	535
4586 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 class StatelessDatabaseOperations::Transaction : public boost::noncopyable
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	540 IDatabaseWrapper& db_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	541 std::unique_ptr<IDatabaseWrapper::ITransaction> transaction_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	542 std::unique_ptr<ITransactionContext> context_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	543 bool isCommitted_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	546 Transaction(IDatabaseWrapper& db,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	547 ITransactionContextFactory& factory,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	548 TransactionType type) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	549 db_(db),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	550 isCommitted_(false)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	551 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	552 context_.reset(factory.Create());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	553 if (context_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	554 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	555 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	556 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	557
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4587 diff changeset	558 transaction_.reset(db_.StartTransaction(type, *context_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	559 if (transaction_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	560 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	561 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	562 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	563 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	564
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	565 ~Transaction()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	566 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	567 if (!isCommitted_)
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 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	570 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	571 transaction_->Rollback();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	572 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	573 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	574 {
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	575 LOG(INFO) << "Cannot rollback transaction: " << e.What();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	576 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	577 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	578 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	579
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	580 IDatabaseWrapper::ITransaction& GetDatabaseTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	581 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	582 assert(transaction_.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	583 return *transaction_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	584 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	585
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	586 void Commit()
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 if (isCommitted_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	589 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	590 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	591 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	592 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	593 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	594 int64_t delta = context_->GetCompressedSizeDelta();
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 transaction_->Commit(delta);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	597 context_->Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	598 isCommitted_ = true;
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 }
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 ITransactionContext& GetContext() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	603 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	604 assert(context_.get() != NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	605 return *context_;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	609
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	610 void StatelessDatabaseOperations::ApplyInternal(IReadOnlyOperations* readOperations,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	611 IReadWriteOperations* writeOperations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	612 {
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	613 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	614
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	615 if ((readOperations == NULL && writeOperations == NULL) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	616 (readOperations != NULL && writeOperations != NULL))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	617 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	618 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	619 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	620
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	621 if (factory_.get() == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	622 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	623 throw OrthancException(ErrorCode_BadSequenceOfCalls, "No transaction context was provided");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	624 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	625
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	626 unsigned int attempt = 0;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	627
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	628 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	629 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	630 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	631 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	632 if (readOperations != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	633 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	634 /**
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	635 * 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	636 * 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	637 * global mutex that was protecting the database.
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	638 **/
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	639
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	640 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	641 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	642 ReadOnlyTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	643 readOperations->Apply(t);
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 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	646 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	647 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	648 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	649 assert(writeOperations != NULL);
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 Transaction transaction(db_, *factory_, TransactionType_ReadWrite);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	652 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	653 ReadWriteTransaction t(transaction.GetDatabaseTransaction(), transaction.GetContext());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	654 writeOperations->Apply(t);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	655 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	656 transaction.Commit();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	657 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	658
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	659 return; // Success
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	660 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	661 catch (OrthancException& e)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	662 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	663 if (e.GetErrorCode() == ErrorCode_DatabaseCannotSerialize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	664 {
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	665 if (attempt >= maxRetries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	666 {
5492 26877f4b306f now only logging 'Maximum transactions retries reached' as an error Alain Mazy <am@osimis.io> parents: 5466 diff changeset	667 LOG(ERROR) << "Maximum transactions retries reached " << e.GetDetails();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	668 throw;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	670 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	671 {
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	672 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	673
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	674 // 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	675 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	676 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	677 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	678 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	679 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	680 throw;
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 }
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 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	687 StatelessDatabaseOperations::StatelessDatabaseOperations(IDatabaseWrapper& db) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	688 db_(db),
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	689 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	690 maxRetries_(0)
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	691 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	692 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	693
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	694
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	695 void StatelessDatabaseOperations::FlushToDisk()
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	696 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	697 try
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	698 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	699 db_.FlushToDisk();
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	700 }
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	701 catch (OrthancException&)
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	702 {
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	703 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	704 }
4586 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::SetTransactionContextFactory(ITransactionContextFactory* factory)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	709 {
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	710 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	711
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	712 if (factory == NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	713 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	714 throw OrthancException(ErrorCode_NullPointer);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	715 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	716 else if (factory_.get() != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	717 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	718 throw OrthancException(ErrorCode_BadSequenceOfCalls);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	719 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	720 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	721 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	722 factory_.reset(factory);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	723 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	724 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	725
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	726
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	727 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	728 {
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	729 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	730 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	731 }
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	732
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	733
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	734 void StatelessDatabaseOperations::Apply(IReadOnlyOperations& operations)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	735 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	736 ApplyInternal(&operations, NULL);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	737 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	738
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	739
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	740 void StatelessDatabaseOperations::Apply(IReadWriteOperations& operations)
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 ApplyInternal(NULL, &operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	743 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	744
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	745
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	746 bool StatelessDatabaseOperations::ExpandResource(ExpandedResource& target,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	747 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	748 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	749 const std::set<DicomTag>& requestedTags,
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	750 ExpandResourceFlags expandFlags)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	751 {
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	752 class Operations : public ReadOnlyOperationsT6<
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	753 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	754 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	755 private:
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	756 bool hasLabelsSupport_;
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	757
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	758 static bool LookupStringMetadata(std::string& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	759 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	760 MetadataType type)
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 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	763
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	764 if (found == metadata.end())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	765 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	766 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	767 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	768 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	769 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	770 result = found->second;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	771 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	772 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	773 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	774
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 static bool LookupIntegerMetadata(int64_t& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	777 const std::map<MetadataType, std::string>& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	778 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	779 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	780 std::string s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	781 if (!LookupStringMetadata(s, metadata, type))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	782 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	783 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	784 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	785
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	786 try
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 result = boost::lexical_cast<int64_t>(s);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	789 return true;
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 catch (boost::bad_lexical_cast&)
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 return false;
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	796
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	797
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	798 public:
5526 9a431368801b cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 5523 diff changeset	799 explicit Operations(bool hasLabelsSupport) :
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	800 hasLabelsSupport_(hasLabelsSupport)
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	801 {
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	802 }
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	803
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	804 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	807 // 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	808 int64_t internalId;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	809 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	810 std::string parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	811 if (!transaction.LookupResourceAndParent(internalId, type, parent, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	812 type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	813 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	814 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	815 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	816 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817 {
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	818 ExpandedResource& target = tuple.get<1>();
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	819 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	820
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	821 // Set information about the parent resource (if it exists)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	822 if (type == ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	823 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	824 if (!parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	825 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	826 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	827 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	828 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	829 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	830 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	831 if (parent.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	832 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833 throw OrthancException(ErrorCode_DatabasePlugin);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	834 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	835
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	836 target.parentId_ = parent;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	837 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	838
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	839 target.SetResource(type, tuple.get<2>());
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	840
3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	841 if (expandFlags & ExpandResourceFlags_IncludeChildren)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	842 {
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	843 // 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	844 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	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
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	847 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	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 // 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	850 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	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 switch (type)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	853 {
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	854 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	855 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	856 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	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 case ResourceType_Series:
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	859 {
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	860 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	861 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	862 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	863 target.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	864 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	865 }
304514ce84ee tools/find + 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 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	867 {
304514ce84ee tools/find + 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 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	869 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	870 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	871
304514ce84ee tools/find + 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 break;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	874
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 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	876 {
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	877 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	878 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	879 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	880 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	881 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	882 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	883
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	884 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	885 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	886
304514ce84ee tools/find + 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 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	888 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	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 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	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 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	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 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	895 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	896
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	897 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	898 }
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	899
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	900 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	901 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	902 }
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 // 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	905 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	906 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	907 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	908
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	909 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	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 // read all tags from DB
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	912 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	913
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	914 // 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	915 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	916 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	917 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	918 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	919 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	920
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	921 assert(jsonMetadata["Version"].asInt() == 1);
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	922 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	923 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	924
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	925 // 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	926 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	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 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	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 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	931
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	932 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	933
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	934 // 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	935 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	936 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	937 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	938
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	939 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	940 && currentLevel != ResourceType_Patient)
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	941 {
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	942 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	943
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	944 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	945 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	946 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	947 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	948 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	949
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	950 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	951 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	952
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	953 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	954 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	955
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	956 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	957 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	958
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	959 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	960 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	961 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	962
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	963 // 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	964 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	965 {
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	966 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	967
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	968 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	969 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	970
5222 3a61fd50f804 starting refactoring ExpandedResource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5221 diff changeset	971 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	972 }
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	973
304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	974 currentInternalId = currentParentId;
4938 f630796a59b1 ExpandResource now able to return computed tags (like ModalitiesInStudies) Alain Mazy <am@osimis.io> parents: 4936 diff changeset	975 }
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	976 }
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	977 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978
5237 cd2258ca7894 log about missing support for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5234 diff changeset	979 if ((expandFlags & ExpandResourceFlags_IncludeLabels) &&
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	980 hasLabelsSupport_)
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	981 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	982 transaction.ListLabels(target.labels_, internalId);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	983 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	984
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	985 std::string tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	986
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	987 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_AnonymizedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	988 {
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	989 target.anonymizedFrom_ = tmp;
4586 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
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	992 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_ModifiedFrom))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	993 {
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	994 target.modifiedFrom_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	995 }
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 if (type == ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	998 type == ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	999 type == ResourceType_Series)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1000 {
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	1001 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	1002
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	1003 if (LookupStringMetadata(tmp, target.metadata_, MetadataType_LastUpdate))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1004 {
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	1005 target.lastUpdate_ = tmp;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1006 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1007 }
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	1008 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	1009 {
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	1010 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	1011 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1012
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1013 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1014 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1015 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1016 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1017
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1018 bool found;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1019 Operations operations(db_.GetDatabaseCapabilities().HasLabelsSupport());
4940 304514ce84ee tools/find + C-Find + list-resources now all using the same code (ExpandResource) to build 'computed tags' Alain Mazy <am@osimis.io> parents: 4939 diff changeset	1020 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	1021 return found;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1024
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1025 void StatelessDatabaseOperations::GetAllMetadata(std::map<MetadataType, std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1026 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1028 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1029 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	1030 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1031 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1032 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1033 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1034 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1035 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1036 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1037 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1038 tuple.get<2>() != type)
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 throw OrthancException(ErrorCode_UnknownResource);
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 else
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 transaction.GetAllMetadata(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1045 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1046 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1047 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1048
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1049 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 operations.Apply(*this, target, publicId, level);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1053
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1054 bool StatelessDatabaseOperations::LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1055 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1056 const std::string& instancePublicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1057 FileContentType contentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1058 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1059 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	1060 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1061 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1062 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1063 const Tuple& tuple) ORTHANC_OVERRIDE
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 int64_t internalId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 ResourceType type;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1067 if (!transaction.LookupResource(internalId, type, tuple.get<3>()))
4586 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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1070 }
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1071 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	1072 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1073 assert(tuple.get<1>().GetContentType() == tuple.get<4>());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1074 tuple.get<0>() = true;
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 else
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 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1079 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1080 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1081 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1082
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1083 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1084 Operations operations;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1085 operations.Apply(*this, found, attachment, revision, instancePublicId, contentType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1086 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1087 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1090 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091 ResourceType resourceType)
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 class Operations : public ReadOnlyOperationsT2<std::list<std::string>&, ResourceType>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1094 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1095 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1096 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1097 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1100 transaction.GetAllPublicIds(tuple.get<0>(), tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1101 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1102 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1103
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1104 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1105 operations.Apply(*this, target, resourceType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1106 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1109 void StatelessDatabaseOperations::GetAllUuids(std::list<std::string>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1110 ResourceType resourceType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1111 size_t since,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1112 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1113 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1114 if (limit == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1115 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1116 target.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1117 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1118 else
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 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	1121 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1122 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1123 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1124 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1127 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	1128 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1129 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1132 operations.Apply(*this, target, resourceType, since, limit);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1133 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1134 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1135
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 void StatelessDatabaseOperations::GetGlobalStatistics(/* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1138 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1139 /* out */ uint64_t& countPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1140 /* out */ uint64_t& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1141 /* out */ uint64_t& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1142 /* out */ uint64_t& countInstances)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1143 {
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	1144 // Code introduced in Orthanc 1.12.3 that updates and gets all statistics.
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1145 // I.e, PostgreSQL now store "changes" to apply to the statistics to prevent row locking
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1146 // of the GlobalIntegers table while multiple clients are inserting/deleting new resources.
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1147 // Then, the statistics are updated when requested to make sure they are correct.
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1148 class Operations : public IReadWriteOperations
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1149 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1150 private:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1151 int64_t diskSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1152 int64_t uncompressedSize_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1153 int64_t countPatients_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1154 int64_t countStudies_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1155 int64_t countSeries_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1156 int64_t countInstances_;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1157
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1158 public:
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1159 Operations() :
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1160 diskSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1161 uncompressedSize_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1162 countPatients_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1163 countStudies_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1164 countSeries_(0),
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1165 countInstances_(0)
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1166 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1167 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1168
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1169 void GetValues(uint64_t& diskSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1170 uint64_t& uncompressedSize,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1171 uint64_t& countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1172 uint64_t& countStudies,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1173 uint64_t& countSeries,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1174 uint64_t& countInstances) const
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1175 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1176 diskSize = static_cast<uint64_t>(diskSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1177 uncompressedSize = static_cast<uint64_t>(uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1178 countPatients = static_cast<uint64_t>(countPatients_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1179 countStudies = static_cast<uint64_t>(countStudies_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1180 countSeries = static_cast<uint64_t>(countSeries_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1181 countInstances = static_cast<uint64_t>(countInstances_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1182 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1183
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1184 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1185 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1186 transaction.UpdateAndGetStatistics(countPatients_, countStudies_, countSeries_, countInstances_, diskSize_, uncompressedSize_);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1187 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1188 };
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1189
5523 d82cc7c9720a comment Sebastien Jodogne <s.jodogne@gmail.com> parents: 5522 diff changeset	1190 // Compatibility with Orthanc SDK <= 1.12.2 that reads each entry individualy
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1191 class LegacyOperations : public ReadOnlyOperationsT6<uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&, uint64_t&>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1192 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1193 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1194 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1195 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1197 tuple.get<0>() = transaction.GetTotalCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1198 tuple.get<1>() = transaction.GetTotalUncompressedSize();
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1199 tuple.get<2>() = transaction.GetResourcesCount(ResourceType_Patient);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1200 tuple.get<3>() = transaction.GetResourcesCount(ResourceType_Study);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1201 tuple.get<4>() = transaction.GetResourcesCount(ResourceType_Series);
cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1202 tuple.get<5>() = transaction.GetResourcesCount(ResourceType_Instance);
4586 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 };
5466 dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1205
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1206 if (GetDatabaseCapabilities().HasUpdateAndGetStatistics())
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1207 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1208 Operations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1209 Apply(operations);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1210
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1211 operations.GetValues(diskSize, uncompressedSize, countPatients, countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1212 }
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1213 else
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1214 {
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1215 LegacyOperations operations;
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1216 operations.Apply(*this, diskSize, uncompressedSize, countPatients,
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1217 countStudies, countSeries, countInstances);
dceed5e3d6a9 new DB plugin primitive: UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 5464 diff changeset	1218 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1219 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1220
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1221
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1222 void StatelessDatabaseOperations::GetChanges(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1223 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1224 unsigned int maxResults)
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 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	1227 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1228 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1229 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1230 const Tuple& tuple) ORTHANC_OVERRIDE
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 // 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	1233 // "GetLastChange()" involves calls to "GetPublicId()"
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 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1236 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1237 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1238 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1239
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1240 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	1241 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1242 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1243 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1244 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1245 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1246
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1247 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	1248 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1249 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1252 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1253 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1254
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1255
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1256 void StatelessDatabaseOperations::GetLastChange(Json::Value& target)
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 class Operations : public ReadOnlyOperationsT1<Json::Value&>
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1261 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1262 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1263 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1264 // 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	1265 // "GetLastChange()" involves calls to "GetPublicId()"
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 std::list<ServerIndexChange> changes;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1268 bool hasLast = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1269 int64_t last = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1270
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1271 transaction.GetLastChange(changes);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1272 if (changes.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1273 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1274 last = transaction.GetLastChangeIndex();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1275 hasLast = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1276 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1277
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1278 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	1279 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1280 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1281
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1282 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1283 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1284 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1285
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 void StatelessDatabaseOperations::GetExportedResources(Json::Value& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1288 int64_t since,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1289 unsigned int maxResults)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1290 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1291 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	1292 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1293 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1294 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1295 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
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 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1300 bool done;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1301 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	1302 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	1303 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1304 };
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 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1307 operations.Apply(*this, target, since, maxResults);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1308 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1309
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 void StatelessDatabaseOperations::GetLastExportedResource(Json::Value& target)
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 class Operations : public ReadOnlyOperationsT1<Json::Value&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1314 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1315 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1316 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1317 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1320
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1321 std::list<ExportedResource> exported;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1322 transaction.GetLastExportedResource(exported);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1323 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	1324 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1325 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1326
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1327 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1328 operations.Apply(*this, target);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1329 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1330
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1331
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1332 bool StatelessDatabaseOperations::IsProtectedPatient(const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1333 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1334 class Operations : public ReadOnlyOperationsT2<bool&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1335 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1336 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1337 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1338 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1339 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1340 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1341 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1342 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1343 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1344 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1345 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1346 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1347 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1348 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1349 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1350 tuple.get<0>() = transaction.IsProtectedPatient(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1351 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1352 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1353 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1354
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1355 bool isProtected;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1356 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1357 operations.Apply(*this, isProtected, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1358 return isProtected;
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 void StatelessDatabaseOperations::GetChildren(std::list<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1363 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1364 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1365 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	1366 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1367 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1368 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1369 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1370 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1371 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1372 int64_t resource;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1373 if (!transaction.LookupResource(resource, type, tuple.get<1>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1374 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1375 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1376 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1377 else if (type == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1378 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1379 // An instance cannot have a child
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1380 throw OrthancException(ErrorCode_BadParameterType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1381 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1382 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1383 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1384 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1385 transaction.GetChildrenInternalId(tmp, resource);
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 tuple.get<0>().clear();
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 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1390 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1391 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1392 tuple.get<0>().push_back(transaction.GetPublicId(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1393 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1394 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1395 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1396 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1397
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1398 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1399 operations.Apply(*this, result, publicId);
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::GetChildInstances(std::list<std::string>& result,
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 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1406 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	1407 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1408 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1409 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1410 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1411 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1412 tuple.get<0>().clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1413
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1414 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1415 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1416 if (!transaction.LookupResource(top, type, tuple.get<1>()))
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 if (type == ResourceType_Instance)
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 // 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	1423 tuple.get<0>().push_back(tuple.get<1>());
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 else
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 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1428 toExplore.push(top);
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 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1431 while (!toExplore.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1432 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1433 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1434 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1435 toExplore.pop();
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 // TODO - This could be optimized by seeing how many
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1438 // levels "type == transaction.GetResourceType(top)" is
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1439 // above the "instances level"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1440 if (transaction.GetResourceType(resource) == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1441 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1442 tuple.get<0>().push_back(transaction.GetPublicId(resource));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1443 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1444 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1445 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1446 // 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	1447 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1448 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1449 it = tmp.begin(); it != tmp.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1450 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1451 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1452 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1453 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1454 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1455 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1456 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1457 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1458
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1459 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1460 operations.Apply(*this, result, publicId);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1464 bool StatelessDatabaseOperations::LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1465 int64_t& revision,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1466 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1467 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1468 MetadataType type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1469 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1470 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	1471 const std::string&, ResourceType, MetadataType>
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1472 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1473 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1474 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1475 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1476 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1477 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1478 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1479 if (!transaction.LookupResource(id, resourceType, tuple.get<3>()) \|\|
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1480 resourceType != tuple.get<4>())
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1481 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1482 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1483 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1484 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1485 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1486 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	1487 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1488 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1489 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1490
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1491 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1492 Operations operations;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	1493 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	1494 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1495 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1496
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1497
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1498 void StatelessDatabaseOperations::ListAvailableAttachments(std::set<FileContentType>& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1499 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1500 ResourceType expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1501 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1502 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	1503 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1504 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1505 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1506 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1507 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1508 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1509 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1510 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1511 tuple.get<2>() != type)
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 throw OrthancException(ErrorCode_UnknownResource);
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 else
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 transaction.ListAvailableAttachments(tuple.get<0>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1518 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1519 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1520 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1521
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1522 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1523 operations.Apply(*this, target, publicId, expectedType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1524 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1525
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1526
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1527 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1528 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1529 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1530 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	1531 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1532 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1533 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1534 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1535 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1536 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1537 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1538 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1539 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1540 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1541 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1542 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1543 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1544 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1545 if (transaction.LookupParent(parentId, id))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1546 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1547 tuple.get<1>() = transaction.GetPublicId(parentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1548 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1549 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1550 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1551 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1552 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1553 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1554 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1555 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1556 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1557
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1558 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1559 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1560 operations.Apply(*this, found, target, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1561 return found;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1565 void StatelessDatabaseOperations::GetResourceStatistics(/* out */ ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1566 /* out */ uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1567 /* out */ uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1568 /* out */ unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1569 /* out */ unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1570 /* out */ unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1571 /* out */ uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1572 /* out */ uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1573 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1574 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1575 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1576 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1577 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1578 ResourceType& type_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1579 uint64_t& diskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1580 uint64_t& uncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1581 unsigned int& countStudies_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1582 unsigned int& countSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1583 unsigned int& countInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1584 uint64_t& dicomDiskSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1585 uint64_t& dicomUncompressedSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1586 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1587
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1588 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1589 explicit Operations(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1590 uint64_t& diskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1591 uint64_t& uncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1592 unsigned int& countStudies,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1593 unsigned int& countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1594 unsigned int& countInstances,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1595 uint64_t& dicomDiskSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1596 uint64_t& dicomUncompressedSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1597 const std::string& publicId) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1598 type_(type),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1599 diskSize_(diskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1600 uncompressedSize_(uncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1601 countStudies_(countStudies),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1602 countSeries_(countSeries),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1603 countInstances_(countInstances),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1604 dicomDiskSize_(dicomDiskSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1605 dicomUncompressedSize_(dicomUncompressedSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1606 publicId_(publicId)
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1609
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1610 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
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 int64_t top;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1613 if (!transaction.LookupResource(top, type_, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1614 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1615 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1616 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1617 else
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 countInstances_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1620 countSeries_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1621 countStudies_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1622 diskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1623 uncompressedSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1624 dicomDiskSize_ = 0;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1625 dicomUncompressedSize_ = 0;
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 std::stack<int64_t> toExplore;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1628 toExplore.push(top);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1629
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1630 while (!toExplore.empty())
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 // Get the internal ID of the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1633 int64_t resource = toExplore.top();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1634 toExplore.pop();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1635
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1636 ResourceType thisType = transaction.GetResourceType(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1637
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1638 std::set<FileContentType> f;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1639 transaction.ListAvailableAttachments(f, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1640
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1641 for (std::set<FileContentType>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1642 it = f.begin(); it != f.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1643 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1644 FileInfo attachment;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1645 int64_t revision; // ignored
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1646 if (transaction.LookupAttachment(attachment, revision, resource, *it))
4586 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 if (attachment.GetContentType() == FileContentType_Dicom)
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 dicomDiskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1651 dicomUncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1652 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1653
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1654 diskSize_ += attachment.GetCompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1655 uncompressedSize_ += attachment.GetUncompressedSize();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1656 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1657 }
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 if (thisType == ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1660 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1661 countInstances_++;
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 else
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 switch (thisType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1666 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1667 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1668 countStudies_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1669 break;
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 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1672 countSeries_++;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1673 break;
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 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1676 break;
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 // 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	1680 std::list<int64_t> tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1681 transaction.GetChildrenInternalId(tmp, resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1682 for (std::list<int64_t>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1683 it = tmp.begin(); it != tmp.end(); ++it)
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 toExplore.push(*it);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1686 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1687 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1688 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1689
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1690 if (countStudies_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1691 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1692 countStudies_ = 1;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1695 if (countSeries_ == 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1696 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1697 countSeries_ = 1;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1698 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1699 }
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 Operations operations(type, diskSize, uncompressedSize, countStudies, countSeries,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1704 countInstances, dicomDiskSize, dicomUncompressedSize, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1705 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1706 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1709 void StatelessDatabaseOperations::LookupIdentifierExact(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1710 ResourceType level,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1711 const DicomTag& tag,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1712 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1713 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1714 assert((level == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1715 (level == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1716 (level == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1717 (level == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1718 (level == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1719
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1720 result.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1721
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1722 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1723
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1724 std::vector<DatabaseConstraint> query;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1725 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1726
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1727
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1728 class Operations : public IReadOnlyOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1729 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1730 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1731 std::vector<std::string>& result_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1732 const std::vector<DatabaseConstraint>& query_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1733 ResourceType level_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1736 Operations(std::vector<std::string>& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1737 const std::vector<DatabaseConstraint>& query,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1738 ResourceType level) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1739 result_(result),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1740 query_(query),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1741 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1742 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1743 }
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 virtual void Apply(ReadOnlyTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1746 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1747 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1748 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	1749 std::set<std::string> labels;
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	1750 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	1751 CopyListToVector(result_, tmp);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1755 Operations operations(result, query, level);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1756 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1757 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1758
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 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	1761 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1762 bool shared)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1763 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1764 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	1765 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1766 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1767 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1768 const Tuple& tuple) ORTHANC_OVERRIDE
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 // TODO - CANDIDATE FOR "TransactionType_Implicit"
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1771 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	1772 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1773 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1774
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1775 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1776 Operations operations;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1777 operations.Apply(*this, found, value, property, shared);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1778 return found;
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1781
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1782 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	1783 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1784 const std::string& defaultValue)
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 std::string s;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	1787 if (LookupGlobalProperty(s, property, shared))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1788 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1789 return s;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1790 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1791 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1792 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1793 return defaultValue;
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1796
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1797
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1798 bool StatelessDatabaseOperations::GetMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1799 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1800 ResourceType expectedType,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1801 ResourceType levelOfInterest)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1802 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1803 // 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	1804 if (!(expectedType == ResourceType_Patient && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1805 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Patient) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1806 !(expectedType == ResourceType_Study && levelOfInterest == ResourceType_Study) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1807 !(expectedType == ResourceType_Series && levelOfInterest == ResourceType_Series) &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1808 !(expectedType == ResourceType_Instance && levelOfInterest == ResourceType_Instance))
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 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1811 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1812
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1813
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1814 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	1815 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1816 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1817 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1818 const Tuple& tuple) ORTHANC_OVERRIDE
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 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1821 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1822 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1823 if (!transaction.LookupResource(id, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1824 type != tuple.get<3>())
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 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1827 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1828 else if (type == ResourceType_Study)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1829 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1830 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1831 transaction.GetMainDicomTags(tmp, id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1832
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1833 switch (tuple.get<4>())
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 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1836 tmp.ExtractPatientInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1837 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1838 break;
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 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1841 tmp.ExtractStudyInformation(tuple.get<1>());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1842 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1843 break;
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 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1846 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1847 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1848 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1849 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1850 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1851 transaction.GetMainDicomTags(tuple.get<1>(), id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1852 tuple.get<0>() = true;
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1855 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1856
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1857 result.Clear();
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 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1860 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1861 operations.Apply(*this, found, result, publicId, expectedType, levelOfInterest);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1862 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1863 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1864
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1865
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1866 bool StatelessDatabaseOperations::GetAllMainDicomTags(DicomMap& result,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1867 const std::string& instancePublicId)
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 class Operations : public ReadOnlyOperationsT3<bool&, DicomMap&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1870 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1871 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1872 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1873 const Tuple& tuple) ORTHANC_OVERRIDE
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 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1876 int64_t instance;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1877 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1878 if (!transaction.LookupResource(instance, type, tuple.get<2>()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1879 type != ResourceType_Instance)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1880 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1881 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1882 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1883 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1884 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1885 DicomMap tmp;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1886
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1887 transaction.GetMainDicomTags(tmp, instance);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1888 tuple.get<1>().Merge(tmp);
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 int64_t series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1891 if (!transaction.LookupParent(series, instance))
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 throw OrthancException(ErrorCode_InternalError);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1896 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1897 transaction.GetMainDicomTags(tmp, series);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1898 tuple.get<1>().Merge(tmp);
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 int64_t study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1901 if (!transaction.LookupParent(study, series))
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 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1904 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1905
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1906 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1907 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1908 tuple.get<1>().Merge(tmp);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1909
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1910 #ifndef NDEBUG
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 // 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	1913 // patient level are copied at the study level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1914
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1915 int64_t patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1916 if (!transaction.LookupParent(patient, study))
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 throw OrthancException(ErrorCode_InternalError);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1921 tmp.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1922 transaction.GetMainDicomTags(tmp, study);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1923
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1924 std::set<DicomTag> patientTags;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1925 tmp.GetTags(patientTags);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1926
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1927 for (std::set<DicomTag>::const_iterator
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1928 it = patientTags.begin(); it != patientTags.end(); ++it)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1929 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1930 assert(tuple.get<1>().HasTag(*it));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1931 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1932 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1933 #endif
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 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1936 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1937 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1938 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1939
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1940 result.Clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1941
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1942 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1943 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1944 operations.Apply(*this, found, result, instancePublicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1945 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1946 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1947
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 bool StatelessDatabaseOperations::LookupResourceType(ResourceType& type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1950 const std::string& publicId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1951 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1952 class Operations : public ReadOnlyOperationsT3<bool&, ResourceType&, const std::string&>
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1953 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1954 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1955 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1956 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1957 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1958 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1959 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1960 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	1961 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1962 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1963
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1964 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1965 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1966 operations.Apply(*this, found, type, publicId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1967 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1968 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1969
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1970
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1971 bool StatelessDatabaseOperations::LookupParent(std::string& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1972 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1973 ResourceType parentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1974 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1975 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	1976 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1977 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1978 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1979 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1980 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1981 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1982 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1983 if (!transaction.LookupResource(id, type, tuple.get<2>()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1984 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1985 throw OrthancException(ErrorCode_UnknownResource);
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 while (type != tuple.get<3>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1989 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1990 int64_t parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1991
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1992 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	1993 !transaction.LookupParent(parentId, id))
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 tuple.get<0>() = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1996 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1997 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1998
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1999 id = parentId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2000 type = GetParentResourceType(type);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2001 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2002
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2003 tuple.get<0>() = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2004 tuple.get<1>() = transaction.GetPublicId(id);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2005 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2006 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2007
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2008 bool found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2009 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2010 operations.Apply(*this, found, target, publicId, parentType);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2011 return found;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2012 }
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2015 void StatelessDatabaseOperations::ApplyLookupResources(std::vector<std::string>& resourcesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2016 std::vector<std::string>* instancesId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2017 const DatabaseLookup& lookup,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2018 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2019 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	2020 LabelsConstraint labelsConstraint,
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2021 uint32_t limit)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2022 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2023 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	2024 const std::set<std::string>&, LabelsConstraint, size_t>
4586 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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2027 std::list<std::string> resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2028 std::list<std::string> instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2029
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2030 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2031 const std::list<std::string>& GetResourcesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2032 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2033 return resourcesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2034 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2035
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2036 const std::list<std::string>& GetInstancesList() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2037 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2038 return instancesList_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2039 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2040
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2041 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2042 const Tuple& tuple) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2043 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2044 // TODO - CANDIDATE FOR "TransactionType_Implicit"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2045 if (tuple.get<0>())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2046 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2047 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2048 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	2049 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2050 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2051 {
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2052 transaction.ApplyLookupResources(
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	2053 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	2054 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2055 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2056 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2057
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2058 if (!labels.empty() &&
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2059 !db_.GetDatabaseCapabilities().HasLabelsSupport())
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	2060 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	2061 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	2062 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2063
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2064 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	2065 {
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2066 ServerToolbox::CheckValidLabel(*it);
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2067 }
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	2068
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2069 std::vector<DatabaseConstraint> normalized;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2070 NormalizeLookup(normalized, lookup, queryLevel);
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 Operations operations;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5244 diff changeset	2073 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	2074
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2075 CopyListToVector(resourcesId, operations.GetResourcesList());
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 if (instancesId != NULL)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2078 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2079 CopyListToVector(*instancesId, operations.GetInstancesList());
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2082
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2083
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	2084 bool StatelessDatabaseOperations::DeleteResource(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2085 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2086 ResourceType expectedType)
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 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2089 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2090 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2091 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	2092 Json::Value& remainingAncestor_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2093 const std::string& uuid_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2094 ResourceType expectedType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2095
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2096 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	2097 Operations(Json::Value& remainingAncestor,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2098 const std::string& uuid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2099 ResourceType expectedType) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2100 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	2101 remainingAncestor_(remainingAncestor),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2102 uuid_(uuid),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2103 expectedType_(expectedType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2104 {
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2107 bool IsFound() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2108 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2109 return found_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2110 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2111
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2112 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2113 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2114 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2115 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2116 if (!transaction.LookupResource(id, type, uuid_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2117 expectedType_ != type)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2118 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2119 found_ = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2120 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2121 else
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 found_ = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2124 transaction.DeleteResource(id);
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 std::string remainingPublicId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2127 ResourceType remainingLevel;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2128 if (transaction.GetTransactionContext().LookupRemainingLevel(remainingPublicId, remainingLevel))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2129 {
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	2130 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	2131 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	2132 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	2133 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	2134
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2135 { // 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	2136 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	2137 ResourcesContent content(true);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2138
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2139 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	2140 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	2141 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2142
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2143 do
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2144 {
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2145 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	2146 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2147 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	2148
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2149 transaction.SetResourcesContent(content);
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2150 }
c78138dc3889 When deleting a resource, its parents LastUpdate metadata is now updated Alain Mazy <am@osimis.io> parents: 5296 diff changeset	2151 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2152 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2153 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2154 {
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	2155 remainingAncestor_["RemainingAncestor"] = Json::nullValue;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2156 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2157 }
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
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	2161 Operations operations(remainingAncestor, uuid, expectedType);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2162 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2163 return operations.IsFound();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2164 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2165
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2166
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2167 void StatelessDatabaseOperations::LogExportedResource(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2168 const std::string& remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2169 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2170 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2171 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2172 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2173 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2174 const std::string& remoteModality_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2175
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2176 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2177 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2178 const std::string& remoteModality) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2179 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2180 remoteModality_(remoteModality)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2181 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2182 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2183
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2184 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2185 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2186 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2187 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2188 if (!transaction.LookupResource(id, type, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2189 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2190 throw OrthancException(ErrorCode_InexistentItem);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2191 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2192
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2193 std::string patientId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2194 std::string studyInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2195 std::string seriesInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2196 std::string sopInstanceUid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2197
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2198 int64_t currentId = id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2199 ResourceType currentType = type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2200
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2201 // 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	2202 bool done = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2203 while (!done)
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 DicomMap map;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2206 transaction.GetMainDicomTags(map, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2207
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2208 switch (currentType)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2209 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2210 case ResourceType_Patient:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2211 if (map.HasTag(DICOM_TAG_PATIENT_ID))
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 patientId = map.GetValue(DICOM_TAG_PATIENT_ID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2214 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2215 done = true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2216 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2217
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2218 case ResourceType_Study:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2219 if (map.HasTag(DICOM_TAG_STUDY_INSTANCE_UID))
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 studyInstanceUid = map.GetValue(DICOM_TAG_STUDY_INSTANCE_UID).GetContent();
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 currentType = ResourceType_Patient;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2224 break;
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 case ResourceType_Series:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2227 if (map.HasTag(DICOM_TAG_SERIES_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2228 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2229 seriesInstanceUid = map.GetValue(DICOM_TAG_SERIES_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2230 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2231 currentType = ResourceType_Study;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2232 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2233
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2234 case ResourceType_Instance:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2235 if (map.HasTag(DICOM_TAG_SOP_INSTANCE_UID))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2236 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2237 sopInstanceUid = map.GetValue(DICOM_TAG_SOP_INSTANCE_UID).GetContent();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2238 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2239 currentType = ResourceType_Series;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2240 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2241
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2242 default:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2243 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2244 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2245
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2246 // 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	2247 // the current resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2248 if (!done)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2249 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2250 bool ok = transaction.LookupParent(currentId, currentId);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2251 (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	2252 assert(ok);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2253 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2254 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2255
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2256 ExportedResource resource(-1,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2257 type,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2258 publicId_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2259 remoteModality_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2260 SystemToolbox::GetNowIsoString(true /* use UTC time (not local time) */),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2261 patientId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2262 studyInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2263 seriesInstanceUid,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2264 sopInstanceUid);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2265
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2266 transaction.LogExportedResource(resource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2267 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2268 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2269
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2270 Operations operations(publicId, remoteModality);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2271 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2272 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2273
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2274
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2275 void StatelessDatabaseOperations::SetProtectedPatient(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2276 bool isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2277 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2278 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2279 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2280 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2281 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2282 bool isProtected_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2283
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2284 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2285 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2286 bool isProtected) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2287 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2288 isProtected_(isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2289 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2290 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2291
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2292 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2293 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2294 // Lookup for the requested resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2295 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2296 ResourceType type;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2297 if (!transaction.LookupResource(id, type, publicId_) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2298 type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2299 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2300 throw OrthancException(ErrorCode_ParameterOutOfRange);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2301 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2302 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2303 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2304 transaction.SetProtectedPatient(id, isProtected_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2305 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2306 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2307 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2308
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2309 Operations operations(publicId, isProtected);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2310 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2311
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2312 if (isProtected)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2313 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2314 LOG(INFO) << "Patient " << publicId << " has been protected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2315 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2316 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2317 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2318 LOG(INFO) << "Patient " << publicId << " has been unprotected";
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2319 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2320 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2321
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2322
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2323 void StatelessDatabaseOperations::SetMetadata(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2324 const std::string& publicId,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2325 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2326 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2327 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	2328 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	2329 const std::string& oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2330 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2331 class Operations : public IReadWriteOperations
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2332 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2333 private:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2334 int64_t& newRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2335 const std::string& publicId_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2336 MetadataType type_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2337 const std::string& value_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2338 bool hasOldRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2339 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	2340 const std::string& oldMD5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2341
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2342 public:
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2343 Operations(int64_t& newRevision,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2344 const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2345 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2346 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2347 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	2348 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	2349 const std::string& oldMD5) :
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2350 newRevision_(newRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2351 publicId_(publicId),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2352 type_(type),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2353 value_(value),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2354 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	2355 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	2356 oldMD5_(oldMD5)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2357 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2358 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2359
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2360 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2361 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2362 ResourceType resourceType;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2363 int64_t id;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2364 if (!transaction.LookupResource(id, resourceType, publicId_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2365 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2366 throw OrthancException(ErrorCode_UnknownResource);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2367 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2368 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2369 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2370 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2371 int64_t expectedRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2372 if (transaction.LookupMetadata(oldValue, expectedRevision, id, type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 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 (hasOldRevision_)
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, 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	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 != 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	2380 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	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 }
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	2385
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2386 newRevision_ = expectedRevision + 1;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2387 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2388 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2389 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2390 // The metadata is not existing yet: Ignore "oldRevision"
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2391 // and initialize a new sequence of revisions
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2392 newRevision_ = 0;
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
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2395 transaction.SetMetadata(id, type_, value_, newRevision_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2396
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2397 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2398 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2399 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2400 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2401 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2402 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2403 };
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2404
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	2405 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	2406 Apply(operations);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2407 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2408
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2409
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2410 void StatelessDatabaseOperations::OverwriteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2411 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2412 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2413 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2414 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	2415 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	2416 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2417
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2418
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2419 bool StatelessDatabaseOperations::DeleteMetadata(const std::string& publicId,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2420 MetadataType type,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2421 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	2422 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	2423 const std::string& md5)
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 class Operations : public IReadWriteOperations
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 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2428 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2429 MetadataType type_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2430 bool hasRevision_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2431 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	2432 const std::string& md5_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2433 bool found_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2434
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2435 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2436 Operations(const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2437 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2438 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	2439 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	2440 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2441 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2442 type_(type),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2443 hasRevision_(hasRevision),
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2444 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	2445 md5_(md5),
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2446 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2447 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2448 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2449
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2450 bool HasFound() const
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2451 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2452 return found_;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2453 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2454
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2455 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2456 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2457 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2458 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2459 if (!transaction.LookupResource(id, resourceType, publicId_))
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 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2462 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2463 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2464 {
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	2465 std::string value;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2466 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	2467 if (transaction.LookupMetadata(value, expectedRevision, id, type_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2468 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2469 if (hasRevision_)
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2470 {
4640 66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2471 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	2472 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	2473
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2474 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	2475 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	2476 {
66109d24d26e "ETag" headers for metadata and attachments now allow strong comparison (MD5 is included) Sebastien Jodogne <s.jodogne@gmail.com> parents: 4633 diff changeset	2477 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	2478 }
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2479 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2480
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2481 found_ = true;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2482 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	2483
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2484 if (IsUserMetadata(type_))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2485 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2486 transaction.LogChange(id, ChangeType_UpdatedMetadata, resourceType, publicId_);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2487 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2488 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2489 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2490 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2491 found_ = false;
4586 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 }
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
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	2497 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2498 Apply(operations);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2499 return operations.HasFound();
4586 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
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2503 uint64_t StatelessDatabaseOperations::IncrementGlobalSequence(GlobalProperty sequence,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2504 bool shared)
4586 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 uint64_t newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2510 GlobalProperty sequence_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2511 bool shared_;
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2512 bool hasAtomicIncrementGlobalProperty_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2513
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2514 public:
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2515 Operations(GlobalProperty sequence,
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2516 bool shared,
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2517 bool hasAtomicIncrementGlobalProperty) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2518 newValue_(0), // Dummy initialization
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2519 sequence_(sequence),
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2520 shared_(shared),
dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2521 hasAtomicIncrementGlobalProperty_(hasAtomicIncrementGlobalProperty)
4586 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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2524
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2525 uint64_t GetNewValue() const
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 return newValue_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2528 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2529
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2530 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2531 {
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2532 if (hasAtomicIncrementGlobalProperty_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2533 {
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2534 newValue_ = static_cast<uint64_t>(transaction.IncrementGlobalProperty(sequence_, shared_, 1));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2535 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2536 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2537 {
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2538 std::string oldString;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2539
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2540 if (transaction.LookupGlobalProperty(oldString, sequence_, shared_))
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2541 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2542 uint64_t oldValue;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2543
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2544 try
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2545 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2546 oldValue = boost::lexical_cast<uint64_t>(oldString);
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2547 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2548 catch (boost::bad_lexical_cast&)
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2549 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2550 LOG(ERROR) << "Cannot read the global sequence "
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2551 << boost::lexical_cast<std::string>(sequence_) << ", resetting it";
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2552 oldValue = 0;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2553 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2554
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2555 newValue_ = oldValue + 1;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2556 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2557 else
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2558 {
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2559 // Initialize the sequence at "1"
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2560 newValue_ = 1;
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2561 }
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2562
176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	2563 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	2564 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2565 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2566 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2567
5522 dd430a1b21fe simplifying StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	2568 Operations operations(sequence, shared, GetDatabaseCapabilities().HasAtomicIncrementGlobalProperty());
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2569 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2570 assert(operations.GetNewValue() != 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2571 return operations.GetNewValue();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2572 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2573
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2574
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2575 void StatelessDatabaseOperations::DeleteChanges()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2576 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2577 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2578 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2579 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2580 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2581 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2582 transaction.ClearChanges();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2583 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2584 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2585
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2586 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2587 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2588 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2589
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2590
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2591 void StatelessDatabaseOperations::DeleteExportedResources()
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2592 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2593 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2594 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2595 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2596 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2597 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2598 transaction.ClearExportedResources();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2599 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2600 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2601
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2602 Operations operations;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2603 Apply(operations);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2607 void StatelessDatabaseOperations::SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2608 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2609 const std::string& value)
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 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2612 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2613 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2614 GlobalProperty property_;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2615 bool shared_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2616 const std::string& value_;
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 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2619 Operations(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2620 bool shared,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2621 const std::string& value) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2622 property_(property),
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2623 shared_(shared),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2624 value_(value)
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 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2627
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2628 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2629 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2630 transaction.SetGlobalProperty(property_, shared_, value_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2631 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2632 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2633
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4602 diff changeset	2634 Operations operations(property, shared, value);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2635 Apply(operations);
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
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2639 bool StatelessDatabaseOperations::DeleteAttachment(const std::string& publicId,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2640 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2641 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	2642 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	2643 const std::string& md5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2644 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2645 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2646 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2647 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2648 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2649 FileContentType type_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2650 bool hasRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2651 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	2652 const std::string& md5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2653 bool found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2654
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2655 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2656 Operations(const std::string& publicId,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2657 FileContentType type,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2658 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	2659 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	2660 const std::string& md5) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2661 publicId_(publicId),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2662 type_(type),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2663 hasRevision_(hasRevision),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2664 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	2665 md5_(md5),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2666 found_(false)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2667 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2668 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2669
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2670 bool HasFound() const
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2671 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2672 return found_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2673 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2674
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2675 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2676 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2677 ResourceType resourceType;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2678 int64_t id;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2679 if (!transaction.LookupResource(id, resourceType, publicId_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2680 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2681 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2682 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2683 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2684 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2685 FileInfo info;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2686 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2687 if (transaction.LookupAttachment(info, expectedRevision, id, type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2688 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2689 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	2690 (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	2691 info.GetUncompressedMD5() != md5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2692 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2693 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2694 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2695
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2696 found_ = true;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2697 transaction.DeleteAttachment(id, type_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2698
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2699 if (IsUserContentType(type_))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2700 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2701 transaction.LogChange(id, ChangeType_UpdatedAttachment, resourceType, publicId_);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2702 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2703 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2704 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2705 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2706 found_ = false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2707 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2708 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2709 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2710 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2711
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	2712 Operations operations(publicId, type, hasRevision, revision, md5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2713 Apply(operations);
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	2714 return operations.HasFound();
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2715 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2716
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2717
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2718 void StatelessDatabaseOperations::LogChange(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2719 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2720 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2721 ResourceType level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2722 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2723 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2724 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2725 private:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2726 int64_t internalId_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2727 ChangeType changeType_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2728 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2729 ResourceType level_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2730
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2731 public:
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2732 Operations(int64_t internalId,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2733 ChangeType changeType,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2734 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2735 ResourceType level) :
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2736 internalId_(internalId),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2737 changeType_(changeType),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2738 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2739 level_(level)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2740 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2741 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2742
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2743 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2744 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2745 int64_t id;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2746 ResourceType type;
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2747 if (transaction.LookupResource(id, type, publicId_) &&
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2748 id == internalId_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2749 {
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2750 /**
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2751 * 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	2752 * same internal ID, which indicates the absence of bouncing
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2753 * (if deleting then recreating the same resource). Don't
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2754 * throw an exception if the resource has been deleted,
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2755 * because this function might e.g. be called from
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2756 * "StatelessDatabaseOperations::UnstableResourcesMonitorThread()"
888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2757 * (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	2758 **/
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2759 if (type == level_)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2760 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2761 transaction.LogChange(id, changeType_, type, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2762 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2763 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2764 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2765 // Consistency check
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2766 throw OrthancException(ErrorCode_UnknownResource);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2767 }
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 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2771
4587 888868a5dc4e ServerIndex now uses StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4586 diff changeset	2772 Operations operations(internalId, changeType, publicId, level);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2773 Apply(operations);
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
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2776
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2777 static void GetMainDicomSequenceMetadataContent(std::string& result,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2778 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2779 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2780 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2781 DicomMap levelSummary;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2782 DicomMap levelSequences;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2783
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2784 dicomSummary.ExtractResourceInformation(levelSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2785 levelSummary.ExtractSequences(levelSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2786
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2787 if (levelSequences.GetSize() > 0)
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 Json::Value jsonMetadata;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2790 jsonMetadata["Version"] = 1;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2791 jsonMetadata["Sequences"] = Json::objectValue;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2792 FromDcmtkBridge::ToJson(jsonMetadata["Sequences"], levelSequences, DicomToJsonFormat_Full);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2793
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2794 Toolbox::WriteFastJson(result, jsonMetadata);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2795 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2796 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2797
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2798
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2799 void StatelessDatabaseOperations::ReconstructInstance(const ParsedDicomFile& dicom, bool limitToThisLevelDicomTags, ResourceType limitToLevel)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2800 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2801 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2802 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2803 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2804 DicomMap summary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2805 std::unique_ptr<DicomInstanceHasher> hasher_;
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2806 bool limitToThisLevelDicomTags_;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2807 ResourceType limitToLevel_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2808 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2809 DicomTransferSyntax transferSyntax_;
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2810
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2811 static void ReplaceMetadata(ReadWriteTransaction& transaction,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2812 int64_t instance,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2813 MetadataType metadata,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2814 const std::string& value)
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2815 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2816 std::string oldValue;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2817 int64_t oldRevision;
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2818
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2819 if (transaction.LookupMetadata(oldValue, oldRevision, instance, metadata))
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2820 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2821 transaction.SetMetadata(instance, metadata, value, oldRevision + 1);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2822 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2823 else
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2824 {
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2825 transaction.SetMetadata(instance, metadata, value, 0);
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2826 }
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2827 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2828
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2829 static void SetMainDicomSequenceMetadata(ReadWriteTransaction& transaction,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2830 int64_t instance,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2831 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2832 ResourceType level)
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2833 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2834 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2835 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2836
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2837 if (!serialized.empty())
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2838 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2839 ReplaceMetadata(transaction, instance, MetadataType_MainDicomSequences, serialized);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2840 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2841 else
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2842 {
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2843 transaction.DeleteMetadata(instance, MetadataType_MainDicomSequences);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2844 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2845
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2846 }
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	2847
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2848 public:
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2849 explicit Operations(const ParsedDicomFile& dicom, bool limitToThisLevelDicomTags, ResourceType limitToLevel)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2850 : limitToThisLevelDicomTags_(limitToThisLevelDicomTags),
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2851 limitToLevel_(limitToLevel)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2852 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2853 OrthancConfiguration::DefaultExtractDicomSummary(summary_, dicom);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2854 hasher_.reset(new DicomInstanceHasher(summary_));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2855 hasTransferSyntax_ = dicom.LookupTransferSyntax(transferSyntax_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2856 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2857
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2858 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2859 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2860 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	2861
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2862 ResourceType type1, type2, type3, type4;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2863 if (!transaction.LookupResource(patient, type1, hasher_->HashPatient()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2864 !transaction.LookupResource(study, type2, hasher_->HashStudy()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2865 !transaction.LookupResource(series, type3, hasher_->HashSeries()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2866 !transaction.LookupResource(instance, type4, hasher_->HashInstance()) \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2867 type1 != ResourceType_Patient \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2868 type2 != ResourceType_Study \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2869 type3 != ResourceType_Series \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2870 type4 != ResourceType_Instance \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2871 patient == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2872 study == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2873 series == -1 \|\|
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2874 instance == -1)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2875 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2876 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2877 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2878
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2879 if (limitToThisLevelDicomTags_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2880 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4619 diff changeset	2881 ResourcesContent content(false /* prevent the setting of metadata */);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2882 int64_t resource = -1;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2883 if (limitToLevel_ == ResourceType_Patient)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2884 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2885 resource = patient;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2886 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2887 else if (limitToLevel_ == ResourceType_Study)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2888 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2889 resource = study;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2890 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2891 else if (limitToLevel_ == ResourceType_Series)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2892 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2893 resource = series;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2894 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2895 else if (limitToLevel_ == ResourceType_Instance)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2896 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2897 resource = instance;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2898 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2899
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2900 transaction.ClearMainDicomTags(resource);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2901 content.AddResource(resource, limitToLevel_, summary_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2902 transaction.SetResourcesContent(content);
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2903 ReplaceMetadata(transaction, resource, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(limitToLevel_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2904 }
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2905 else
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2906 {
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2907 transaction.ClearMainDicomTags(patient);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2908 transaction.ClearMainDicomTags(study);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2909 transaction.ClearMainDicomTags(series);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2910 transaction.ClearMainDicomTags(instance);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2911
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2912 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2913 ResourcesContent content(false /* prevent the setting of metadata */);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2914 content.AddResource(patient, ResourceType_Patient, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2915 content.AddResource(study, ResourceType_Study, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2916 content.AddResource(series, ResourceType_Series, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2917 content.AddResource(instance, ResourceType_Instance, summary_);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2918
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2919 transaction.SetResourcesContent(content);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2920
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2921 ReplaceMetadata(transaction, patient, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Patient)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2922 ReplaceMetadata(transaction, study, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Study)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2923 ReplaceMetadata(transaction, series, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Series)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2924 ReplaceMetadata(transaction, instance, MetadataType_MainDicomTagsSignature, DicomMap::GetMainDicomTagsSignature(ResourceType_Instance)); // New in Orthanc 1.11.0
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2925
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2926 SetMainDicomSequenceMetadata(transaction, patient, summary_, ResourceType_Patient);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2927 SetMainDicomSequenceMetadata(transaction, study, summary_, ResourceType_Study);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2928 SetMainDicomSequenceMetadata(transaction, series, summary_, ResourceType_Series);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2929 SetMainDicomSequenceMetadata(transaction, instance, summary_, ResourceType_Instance);
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2930 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2931
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2932 if (hasTransferSyntax_)
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2933 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2934 ReplaceMetadata(transaction, instance, MetadataType_Instance_TransferSyntax, GetTransferSyntaxUid(transferSyntax_));
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2935 }
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2936
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2937 const DicomValue* value;
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2938 if ((value = summary_.TestAndGetValue(DICOM_TAG_SOP_CLASS_UID)) != NULL &&
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2939 !value->IsNull() &&
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2940 !value->IsBinary())
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2941 {
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2942 ReplaceMetadata(transaction, instance, MetadataType_Instance_SopClassUid, value->GetContent());
c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2943 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2944 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2945 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2946 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2947
5558 c1ed59a5bdc2 new LimitToThisLevelMainDicomTags reconstruct mode + * Housekeeper plugin: Added an option LimitMainDicomTagsReconstructLevel Alain Mazy <am@orthanc.team> parents: 5526 diff changeset	2948 Operations operations(dicom, limitToThisLevelDicomTags, limitToLevel);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2949 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2950 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2951
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2952
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2953 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxStorageSize(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2954 uint64_t addedInstanceSize)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2955 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2956 if (maximumStorageSize != 0)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2957 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2958 if (maximumStorageSize < addedInstanceSize)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2959 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2960 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	2961 boost::lexical_cast<std::string>(addedInstanceSize) +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2962 " bytes in a storage area limited to " +
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2963 boost::lexical_cast<std::string>(maximumStorageSize));
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
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2966 if (transaction_.IsDiskSizeAbove(maximumStorageSize - addedInstanceSize))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2967 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2968 return true;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2969 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2970 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2971
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2972 return false;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2973 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2974
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2975 bool StatelessDatabaseOperations::ReadWriteTransaction::HasReachedMaxPatientCount(unsigned int maximumPatientCount,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2976 const std::string& patientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2977 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2978 if (maximumPatientCount != 0)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2979 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2980 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	2981 return patientCount > maximumPatientCount;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2982 }
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2983
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2984 return false;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2985 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2986
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2987 bool StatelessDatabaseOperations::ReadWriteTransaction::IsRecyclingNeeded(uint64_t maximumStorageSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2988 unsigned int maximumPatients,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2989 uint64_t addedInstanceSize,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2990 const std::string& newPatientId)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2991 {
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2992 return HasReachedMaxStorageSize(maximumStorageSize, addedInstanceSize)
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2993 \|\| HasReachedMaxPatientCount(maximumPatients, newPatientId);
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	2994 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2995
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2996 void StatelessDatabaseOperations::ReadWriteTransaction::Recycle(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2997 unsigned int maximumPatients,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2998 uint64_t addedInstanceSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2999 const std::string& newPatientId)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3000 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3001 // TODO - Performance: Avoid calls to "IsRecyclingNeeded()"
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3002
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3003 if (IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3004 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3005 // Check whether other DICOM instances from this patient are
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3006 // already stored
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3007 int64_t patientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3008 bool hasPatientToAvoid;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3009
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3010 if (newPatientId.empty())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3011 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3012 hasPatientToAvoid = false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3013 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3014 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3015 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3016 ResourceType type;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3017 hasPatientToAvoid = transaction_.LookupResource(patientToAvoid, type, newPatientId);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3018 if (type != ResourceType_Patient)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3019 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3020 throw OrthancException(ErrorCode_InternalError);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3021 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3022 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3023
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3024 // Iteratively select patient to remove until there is enough
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3025 // space in the DICOM store
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3026 int64_t patientToRecycle;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3027 while (true)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3028 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3029 // 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	3030 // we must avoid to recycle them
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3031 bool ok = (hasPatientToAvoid ?
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3032 transaction_.SelectPatientToRecycle(patientToRecycle, patientToAvoid) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3033 transaction_.SelectPatientToRecycle(patientToRecycle));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3034
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3035 if (!ok)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3036 {
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	3037 throw OrthancException(ErrorCode_FullStorage, "Cannot recycle more patients");
4586 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 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	3041 transaction_.DeleteResource(patientToRecycle);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	3042
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3043 if (!IsRecyclingNeeded(maximumStorageSize, maximumPatients, addedInstanceSize, newPatientId))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3044 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3045 // OK, we're done
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3046 return;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3047 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3048 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3049 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3050 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3051
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3052
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3053 void StatelessDatabaseOperations::StandaloneRecycling(MaxStorageMode maximumStorageMode,
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3054 uint64_t maximumStorageSize,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3055 unsigned int maximumPatientCount)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3056 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3057 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3058 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3059 private:
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3060 uint64_t maximumStorageSize_;
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3061 unsigned int maximumPatientCount_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3062
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3063 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3064 Operations(uint64_t maximumStorageSize,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3065 unsigned int maximumPatientCount) :
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3066 maximumStorageSize_(maximumStorageSize),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3067 maximumPatientCount_(maximumPatientCount)
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 }
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 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3072 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3073 transaction.Recycle(maximumStorageSize_, maximumPatientCount_, 0, "");
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3074 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3075 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3076
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3077 if (maximumStorageMode == MaxStorageMode_Recycle
e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3078 && (maximumStorageSize != 0 \|\| maximumPatientCount != 0))
4602 cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3079 {
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3080 Operations operations(maximumStorageSize, maximumPatientCount);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3081 Apply(operations);
cfdd1f59ff6f fix OrthancCDatabasePlugin.h Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	3082 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3083 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3084
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3085
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3086 StoreStatus StatelessDatabaseOperations::Store(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3087 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3088 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3089 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3090 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3091 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3092 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3093 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3094 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3095 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3096 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3097 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3098 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3099 unsigned int maximumPatients,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3100 bool isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3101 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3102 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3103 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3104 private:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3105 StoreStatus storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3106 std::map<MetadataType, std::string>& instanceMetadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3107 const DicomMap& dicomSummary_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3108 const Attachments& attachments_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3109 const MetadataMap& metadata_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3110 const DicomInstanceOrigin& origin_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3111 bool overwrite_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3112 bool hasTransferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3113 DicomTransferSyntax transferSyntax_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3114 bool hasPixelDataOffset_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3115 uint64_t pixelDataOffset_;
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3116 ValueRepresentation pixelDataVR_;
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3117 MaxStorageMode maximumStorageMode_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3118 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3119 unsigned int maximumPatientCount_;
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3120 bool isReconstruct_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3121
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3122 // Auto-computed fields
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3123 bool hasExpectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3124 int64_t expectedInstances_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3125 std::string hashPatient_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3126 std::string hashStudy_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3127 std::string hashSeries_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3128 std::string hashInstance_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3129
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3130
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3131 static void SetInstanceMetadata(ResourcesContent& content,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3132 std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3133 int64_t instance,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3134 MetadataType metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3135 const std::string& value)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3136 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3137 content.AddMetadata(instance, metadata, value);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3138 instanceMetadata[metadata] = value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3139 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3140
5036 877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3141 static void SetMainDicomSequenceMetadata(ResourcesContent& content,
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3142 int64_t resource,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3143 const DicomMap& dicomSummary,
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3144 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	3145 {
5044 6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3146 std::string serialized;
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3147 GetMainDicomSequenceMetadataContent(serialized, dicomSummary, level);
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3148
6fed78e13233 Refactored DicomMap to handle sequences when needed Alain Mazy <am@osimis.io> parents: 5043 diff changeset	3149 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	3150 {
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3151 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	3152 }
877bc3b96476 Handle Dicom sequences in ExtraMainDicomTags and save them in the 'MainDicomSequences' metadata Alain Mazy <am@osimis.io> parents: 4988 diff changeset	3153 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3154
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3155 static bool ComputeExpectedNumberOfInstances(int64_t& target,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3156 const DicomMap& dicomSummary)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3157 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3158 try
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3159 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3160 const DicomValue* value;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3161 const DicomValue* value2;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3162
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3163 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	3164 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3165 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3166 (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	3167 !value2->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3168 !value2->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3169 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3170 // 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	3171 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	3172 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	3173 target = imagesInAcquisition * countTemporalPositions;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3174 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3175 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3176
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3177 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	3178 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3179 !value->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3180 (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	3181 !value2->IsBinary() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3182 !value2->IsNull())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3183 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3184 // Support of Cardio-PET images
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3185 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	3186 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	3187 target = numberOfSlices * numberOfTimeSlices;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3188 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3189 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3190
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3191 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	3192 !value->IsNull() &&
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3193 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3194 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3195 target = boost::lexical_cast<int64_t>(value->GetContent());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3196 return (target > 0);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3197 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3198 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3199 catch (OrthancException&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3200 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3201 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3202 catch (boost::bad_lexical_cast&)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3203 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3204 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3205
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3206 return false;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3207 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3208
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3209 public:
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3210 Operations(std::map<MetadataType, std::string>& instanceMetadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3211 const DicomMap& dicomSummary,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3212 const Attachments& attachments,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3213 const MetadataMap& metadata,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3214 const DicomInstanceOrigin& origin,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3215 bool overwrite,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3216 bool hasTransferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3217 DicomTransferSyntax transferSyntax,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3218 bool hasPixelDataOffset,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3219 uint64_t pixelDataOffset,
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3220 ValueRepresentation pixelDataVR,
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3221 MaxStorageMode maximumStorageMode,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3222 uint64_t maximumStorageSize,
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3223 unsigned int maximumPatientCount,
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3224 bool isReconstruct) :
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3225 storeStatus_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3226 instanceMetadata_(instanceMetadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3227 dicomSummary_(dicomSummary),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3228 attachments_(attachments),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3229 metadata_(metadata),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3230 origin_(origin),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3231 overwrite_(overwrite),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3232 hasTransferSyntax_(hasTransferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3233 transferSyntax_(transferSyntax),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3234 hasPixelDataOffset_(hasPixelDataOffset),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3235 pixelDataOffset_(pixelDataOffset),
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3236 pixelDataVR_(pixelDataVR),
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3237 maximumStorageMode_(maximumStorageMode),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3238 maximumStorageSize_(maximumStorageSize),
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3239 maximumPatientCount_(maximumPatientCount),
8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3240 isReconstruct_(isReconstruct)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3241 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3242 hasExpectedInstances_ = ComputeExpectedNumberOfInstances(expectedInstances_, dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3243
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3244 instanceMetadata_.clear();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3245
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3246 DicomInstanceHasher hasher(dicomSummary);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3247 hashPatient_ = hasher.HashPatient();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3248 hashStudy_ = hasher.HashStudy();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3249 hashSeries_ = hasher.HashSeries();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3250 hashInstance_ = hasher.HashInstance();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3251 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3252
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3253 StoreStatus GetStoreStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3254 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3255 return storeStatus_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3256 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3257
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3258 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3259 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3260 IDatabaseWrapper::CreateInstanceResult status;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3261 int64_t instanceId;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3262
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3263 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	3264 hashStudy_, hashSeries_, hashInstance_);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3265
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3266 if (isReconstruct_ && isNewInstance)
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 // 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	3269 // 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	3270 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	3271 }
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 // 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	3274 if (!isNewInstance && !isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3275 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3276 // The instance already exists
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3277 if (overwrite_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3278 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3279 // Overwrite the old instance
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3280 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	3281 transaction.DeleteResource(instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3282
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3283 // 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	3284 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	3285 hashStudy_, hashSeries_, hashInstance_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3286 {
5456 06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3287 // Note that, sometime, it does not create a new instance,
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3288 // in very rare occasions in READ COMMITTED mode when multiple clients are pushing the same instance at the same time,
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3289 // this thread will not create the instance because another thread has created it in the meantime.
06eb8bc9f024 raise 409 if multiple clients are writing the same instance at the same time Alain Mazy <am@osimis.io> parents: 5455 diff changeset	3290 // At the end, there is always a thread that creates the instance and this is what we expect.
5464 38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3291
38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3292 // Note, we must delete the attachments that have already been stored from this failed insertion (they have not yet been added into the DB)
38f1d06875ad delete attachment in case of same instance being uploaded multiple times at the same time Alain Mazy <am@osimis.io> parents: 5456 diff changeset	3293 throw OrthancException(ErrorCode_DuplicateResource, "No new instance while overwriting; this might happen if another client has pushed the same instance at the same time.");
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3294 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3295 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3296 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3297 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3298 // 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	3299 transaction.GetAllMetadata(instanceMetadata_, instanceId);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3300 storeStatus_ = StoreStatus_AlreadyStored;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3301 return;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3302 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3303 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3304
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3305
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3306 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	3307 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3308 // 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	3309 // from instance to patient.
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3310
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3311 // 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	3312 // 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	3313 // 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	3314 // 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	3315 // 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	3316 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	3317
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3318 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3319 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3320 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	3321 }
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 (status.isNewStudy_)
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 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	3326 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3327
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3328 if (status.isNewPatient_)
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 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	3331 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3332 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3333
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3334 // 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	3335 uint64_t instanceSize = 0;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3336 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	3337 it != attachments_.end(); ++it)
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 instanceSize += it->GetCompressedSize();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3340 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3341
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3342 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	3343 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3344 if (maximumStorageMode_ == MaxStorageMode_Reject)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3345 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3346 if (transaction.HasReachedMaxStorageSize(maximumStorageSize_, instanceSize))
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3347 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3348 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3349 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	3350 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3351 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	3352 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3353 storeStatus_ = StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3354 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	3355 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3356 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3357 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3358 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3359 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3360 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	3361 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3362 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3363
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3364 // 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	3365 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	3366 it != attachments_.end(); ++it)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3367 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3368 if (isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3369 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3370 // 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	3371 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	3372 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3373
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3374 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	3375 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3376
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3377 if (!isReconstruct_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3378 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3379 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	3380
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3381 // Attach the user-specified metadata (in case of reconstruction, metadata_ contains all past metadata, including the system ones we want to keep)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3382 for (MetadataMap::const_iterator
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3383 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	3384 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3385 switch (it->first.first)
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3386 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3387 case ResourceType_Patient:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3388 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	3389 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3390
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3391 case ResourceType_Study:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3392 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	3393 break;
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 case ResourceType_Series:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3396 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	3397 break;
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 case ResourceType_Instance:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3400 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3401 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	3402 break;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3403
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3404 default:
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3405 throw OrthancException(ErrorCode_ParameterOutOfRange);
5061 e95fadefeb72 new MaximumStorageMode configuration Alain Mazy <am@osimis.io> parents: 5044 diff changeset	3406 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3407 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3408
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	3409 if (!isReconstruct_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3410 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3411 // 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	3412 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	3413 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	3414 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	3415
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3416 if (status.isNewSeries_)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3417 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3418 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	3419 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	3420 SetMainDicomSequenceMetadata(content, status.seriesId_, dicomSummary_, ResourceType_Series); // new in Orthanc 1.11.1
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3421 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3422
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3423 if (status.isNewStudy_)
4988 8fba26292a9f Housekeeper plugin: finalizing + integration tests ok Alain Mazy <am@osimis.io> parents: 4940 diff changeset	3424 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3425 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	3426 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	3427 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	3428 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3429
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3430 if (status.isNewPatient_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3431 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3432 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	3433 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	3434 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	3435 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3436
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3437 // 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	3438 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	3439 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	3440 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	3441 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	3442
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3443 if (status.isNewSeries_)
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 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	3446 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3447 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	3448 boost::lexical_cast<std::string>(expectedInstances_));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3449 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3450
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3451 // 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	3452 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	3453 origin_.GetRemoteAetC());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3454 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3455 // 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	3456 // 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	3457 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3458 MetadataType_Instance_ReceptionDate, now);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3459 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	3460 origin_.GetRemoteAetC());
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3461 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	3462 EnumerationToString(origin_.GetRequestOrigin()));
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3463
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3464 std::string s;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3465
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3466 if (origin_.LookupRemoteIp(s))
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3467 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3468 // 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	3469 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3470 MetadataType_Instance_RemoteIp, s);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3471 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3472
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3473 if (origin_.LookupCalledAet(s))
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3474 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3475 // 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	3476 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3477 MetadataType_Instance_CalledAet, s);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3478 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3479
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3480 if (origin_.LookupHttpUsername(s))
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3481 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3482 // 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	3483 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3484 MetadataType_Instance_HttpUsername, s);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3485 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3486 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3487
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3488 // 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	3489 // 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	3490
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3491 if (hasTransferSyntax_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3492 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3493 // 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	3494 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3495 MetadataType_Instance_TransferSyntax,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3496 GetTransferSyntaxUid(transferSyntax_));
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3497 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3498
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3499 if (hasPixelDataOffset_)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3500 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3501 // 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	3502 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3503 MetadataType_Instance_PixelDataOffset,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3504 boost::lexical_cast<std::string>(pixelDataOffset_));
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3505
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3506 // New in Orthanc 1.12.1
5324 e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3507 if (dicomSummary_.GuessPixelDataValueRepresentation(transferSyntax_) != pixelDataVR_)
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3508 {
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3509 // 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	3510 SetInstanceMetadata(content, instanceMetadata_, instanceId,
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3511 MetadataType_Instance_PixelDataVR,
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3512 EnumerationToString(pixelDataVR_));
e95caa87fed8 only store PixelDataVR metadata if needed Sebastien Jodogne <s.jodogne@gmail.com> parents: 5316 diff changeset	3513 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3514 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3515
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3516 const DicomValue* value;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3517 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	3518 !value->IsNull() &&
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3519 !value->IsBinary())
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3520 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3521 SetInstanceMetadata(content, instanceMetadata_, instanceId,
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3522 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	3523 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3524
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3525
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3526 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	3527 (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	3528 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3529 if (!value->IsNull() &&
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3530 !value->IsBinary())
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3531 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3532 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	3533 MetadataType_Instance_IndexInSeries, Toolbox::StripSpaces(value->GetContent()));
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3534 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3535 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3536
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3537
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3538 transaction.SetResourcesContent(content);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3539 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3540
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3541
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3542 // 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	3543 int64_t expectedNumberOfInstances;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3544 if (ComputeExpectedNumberOfInstances(expectedNumberOfInstances, dicomSummary_))
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3545 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3546 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	3547 if (seriesStatus == SeriesStatus_Complete)
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	3548 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3549 transaction.LogChange(status.seriesId_, ChangeType_CompletedSeries, ResourceType_Series, hashSeries_);
4612 4982733a4e39 fix database retries Sebastien Jodogne <s.jodogne@gmail.com> parents: 4609 diff changeset	3550 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3551 }
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3552
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3553 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	3554 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	3555 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	3556
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3557 // 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	3558 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	3559 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	3560 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	3561 transaction.GetTransactionContext().SignalAttachmentsAdded(instanceSize);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3562
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3563 storeStatus_ = StoreStatus_Success;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3564 }
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
5316 03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3568 Operations operations(instanceMetadata, dicomSummary, attachments, metadata, origin, overwrite,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3569 hasTransferSyntax, transferSyntax, hasPixelDataOffset, pixelDataOffset,
03501a258d9e added instance metadata "PixelDataVR" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5297 diff changeset	3570 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	3571
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3572 try
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3573 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3574 Apply(operations);
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3575 return operations.GetStoreStatus();
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3576 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3577 catch (OrthancException& e)
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3578 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3579 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	3580 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3581 return StoreStatus_StorageFull;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3582 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3583 else
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3584 {
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3585 // 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	3586 throw;
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3587 }
5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3588 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3589 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3590
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3591
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3592 StoreStatus StatelessDatabaseOperations::AddAttachment(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3593 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3594 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3595 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3596 unsigned int maximumPatients,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3597 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	3598 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	3599 const std::string& oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3600 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3601 class Operations : public IReadWriteOperations
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3602 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3603 private:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3604 int64_t& newRevision_;
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3605 StoreStatus status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3606 const FileInfo& attachment_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3607 const std::string& publicId_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3608 uint64_t maximumStorageSize_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3609 unsigned int maximumPatientCount_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3610 bool hasOldRevision_;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3611 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	3612 const std::string& oldMD5_;
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3613
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3614 public:
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3615 Operations(int64_t& newRevision,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3616 const FileInfo& attachment,
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3617 const std::string& publicId,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3618 uint64_t maximumStorageSize,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3619 unsigned int maximumPatientCount,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3620 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	3621 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	3622 const std::string& oldMD5) :
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3623 newRevision_(newRevision),
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3624 status_(StoreStatus_Failure),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3625 attachment_(attachment),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3626 publicId_(publicId),
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3627 maximumStorageSize_(maximumStorageSize),
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3628 maximumPatientCount_(maximumPatientCount),
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3629 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	3630 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	3631 oldMD5_(oldMD5)
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3632 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3633 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3634
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3635 StoreStatus GetStatus() const
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3636 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3637 return status_;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3638 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3639
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3640 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3641 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3642 ResourceType resourceType;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3643 int64_t resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3644 if (!transaction.LookupResource(resourceId, resourceType, publicId_))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3645 {
5296 5053a10da5a2 Fix orphan files remaining in storage when working with MaximumStorageSize Alain Mazy <am@osimis.io> parents: 5249 diff changeset	3646 throw OrthancException(ErrorCode_InexistentItem, HttpStatus_404_NotFound);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3647 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3648 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3649 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3650 // Possibly remove previous attachment
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3651 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3652 FileInfo oldFile;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3653 int64_t expectedRevision;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3654 if (transaction.LookupAttachment(oldFile, expectedRevision, resourceId, attachment_.GetContentType()))
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3655 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3656 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	3657 (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	3658 oldFile.GetUncompressedMD5() != oldMD5_))
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3659 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3660 throw OrthancException(ErrorCode_Revision);
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3661 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3662 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3663 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3664 newRevision_ = expectedRevision + 1;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3665 transaction.DeleteAttachment(resourceId, attachment_.GetContentType());
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3666 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3667 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3668 else
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3669 {
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3670 // The attachment is not existing yet: Ignore "oldRevision"
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3671 // and initialize a new sequence of revisions
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3672 newRevision_ = 0;
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3673 }
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3674 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3675
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3676 // Locate the patient of the target resource
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3677 int64_t patientId = resourceId;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3678 for (;;)
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3679 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3680 int64_t parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3681 if (transaction.LookupParent(parent, patientId))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3682 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3683 // We have not reached the patient level yet
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3684 patientId = parent;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3685 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3686 else
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3687 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3688 // We have reached the patient level
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3689 break;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3690 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3691 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3692
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3693 // Possibly apply the recycling mechanism while preserving this patient
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3694 assert(transaction.GetResourceType(patientId) == ResourceType_Patient);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3695 transaction.Recycle(maximumStorageSize_, maximumPatientCount_,
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3696 attachment_.GetCompressedSize(), transaction.GetPublicId(patientId));
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3697
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	3698 transaction.AddAttachment(resourceId, attachment_, newRevision_);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3699
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3700 if (IsUserContentType(attachment_.GetContentType()))
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3701 {
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3702 transaction.LogChange(resourceId, ChangeType_UpdatedAttachment, resourceType, publicId_);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3703 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3704
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3705 transaction.GetTransactionContext().SignalAttachmentsAdded(attachment_.GetCompressedSize());
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3706
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3707 status_ = StoreStatus_Success;
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3708 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3709 }
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3710 };
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3711
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3712
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	3713 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	3714 hasOldRevision, oldRevision, oldMD5);
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3715 Apply(operations);
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3716 return operations.GetStatus();
1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3717 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3718
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3719
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3720 void StatelessDatabaseOperations::ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3721 const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3722 ResourceType level)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3723 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3724 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	3725 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3726 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3727 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3728 const Tuple& tuple) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3729 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3730 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3731 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3732 if (!transaction.LookupResource(id, type, tuple.get<1>()) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3733 tuple.get<2>() != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3734 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3735 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3736 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3737 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3738 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3739 transaction.ListLabels(tuple.get<0>(), id);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3740 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3741 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3742 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3743
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3744 Operations operations;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3745 operations.Apply(*this, target, publicId, level);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3746 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3747
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3748
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	3749 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	3750 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3751 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	3752 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3753 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	3754 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	3755 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	3756 {
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3757 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	3758 }
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3759 };
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3760
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3761 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	3762 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	3763 }
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3764
f22c8fac764b added "/tools/labels" to list all the labels that are associated with any resource Sebastien Jodogne <s.jodogne@gmail.com> parents: 5248 diff changeset	3765
5495 4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3766 void StatelessDatabaseOperations::AddLabels(const std::string& publicId,
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3767 ResourceType level,
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3768 const std::set<std::string>& labels)
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3769 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3770 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3771 {
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3772 ModifyLabel(publicId, level, *it, LabelOperation_Add);
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3773 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3774 }
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3775
4b3f5986eca1 Added a 'KeepLabels' option in /modify routes (default = false) Alain Mazy <am@osimis.io> parents: 5485 diff changeset	3776
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3777 void StatelessDatabaseOperations::ModifyLabel(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3778 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3779 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3780 LabelOperation operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3781 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3782 class Operations : public IReadWriteOperations
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3783 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3784 private:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3785 const std::string& publicId_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3786 ResourceType level_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3787 const std::string& label_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3788 LabelOperation operation_;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3789
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3790 public:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3791 Operations(const std::string& publicId,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3792 ResourceType level,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3793 const std::string& label,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3794 LabelOperation operation) :
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3795 publicId_(publicId),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3796 level_(level),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3797 label_(label),
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3798 operation_(operation)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3799 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3800 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3801
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3802 virtual void Apply(ReadWriteTransaction& transaction) ORTHANC_OVERRIDE
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3803 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3804 ResourceType type;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3805 int64_t id;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3806 if (!transaction.LookupResource(id, type, publicId_) \|\|
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3807 level_ != type)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3808 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3809 throw OrthancException(ErrorCode_UnknownResource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3810 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3811 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3812 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3813 switch (operation_)
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3814 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3815 case LabelOperation_Add:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3816 transaction.AddLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3817 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3818
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3819 case LabelOperation_Remove:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3820 transaction.RemoveLabel(id, label_);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3821 break;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3822
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3823 default:
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3824 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3825 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3826 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3827 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3828 };
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3829
5244 72dfa0ac84eb lookup for labels in orthanc explorer Sebastien Jodogne <s.jodogne@gmail.com> parents: 5238 diff changeset	3830 ServerToolbox::CheckValidLabel(label);
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3831
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3832 Operations operations(publicId, level, label, operation);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3833 Apply(operations);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	3834 }
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3835
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3836
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3837 bool StatelessDatabaseOperations::HasLabelsSupport()
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3838 {
367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3839 boost::shared_lock<boost::shared_mutex> lock(mutex_);
5455 176bc05f85f4 DB: new Capabilities class to manage future new methods from DB plugins + Added IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 5324 diff changeset	3840 return db_.GetDatabaseCapabilities().HasLabelsSupport();
5238 367e8af46cfd added "HasLabels" in /system Sebastien Jodogne <s.jodogne@gmail.com> parents: 5237 diff changeset	3841 }
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3842
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3843
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3844 void StatelessDatabaseOperations::ExecuteFind(FindResponse& response,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3845 const FindRequest& request)
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3846 {
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3847 class Operations : public ReadOnlyOperationsT3<FindResponse&, const FindRequest&, const std::vector<DatabaseConstraint>&>
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3848 {
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3849 public:
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3850 virtual void ApplyTuple(ReadOnlyTransaction& transaction,
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3851 const Tuple& tuple) ORTHANC_OVERRIDE
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3852 {
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3853 transaction.ExecuteFind(tuple.get<0>(), tuple.get<1>(), tuple.get<2>());
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3854 }
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3855 };
12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3856
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3857 std::vector<DatabaseConstraint> normalized;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3858 NormalizeLookup(normalized, request);
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3859
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3860 Operations operations;
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3861 operations.Apply(*this, response, request, normalized);
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3862 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3863
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3864 // TODO-FIND: we reuse the ExpandedResource class to reuse Serialization code from ExpandedResource
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3865 // But, finally, we might just get rid of ExpandedResource and replace it by FindResponse
5581 4ad301c35f6e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5580 diff changeset	3866 ExpandedResource::ExpandedResource(const FindRequest& request,
5579 77570cce8855 removed redundant FindResponse::resourceId_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5574 diff changeset	3867 const FindResponse::Item& item) :
5581 4ad301c35f6e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5580 diff changeset	3868 id_(item.GetIdentifiers().GetLevel(request.GetLevel())),
5582 17da828f9443 removed FindResponse::Item::level_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5581 diff changeset	3869 level_(request.GetLevel()),
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3870 isStable_(false),
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3871 expectedNumberOfInstances_(0),
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3872 fileSize_(0),
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3873 indexInSeries_(0)
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3874 {
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3875 if (request.HasResponseContent(FindRequest::ResponseContent_MainDicomTags))
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3876 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3877 tags_.Assign(item.GetDicomMap());
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3878 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3879
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3880 if (request.HasResponseContent(FindRequest::ResponseContent_Children))
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3881 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3882 childrenIds_ = item.GetChildren();
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3883 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3884
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3885 if (request.HasResponseContent(FindRequest::ResponseContent_Parent))
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3886 {
5581 4ad301c35f6e refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 5580 diff changeset	3887 parentId_ = item.GetIdentifiers().GetLevel(GetParentResourceType(request.GetLevel()));
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3888 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3889
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3890 if (request.HasResponseContent(FindRequest::ResponseContent_Metadata))
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3891 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3892 metadata_ = item.GetMetadata();
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3893 std::string value;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3894 if (item.LookupMetadata(value, MetadataType_MainDicomTagsSignature))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3895 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3896 mainDicomTagsSignature_ = value;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3897 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3898 if (item.LookupMetadata(value, MetadataType_AnonymizedFrom))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3899 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3900 anonymizedFrom_ = value;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3901 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3902 if (item.LookupMetadata(value, MetadataType_ModifiedFrom))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3903 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3904 modifiedFrom_ = value;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3905 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3906 if (item.LookupMetadata(value, MetadataType_LastUpdate))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3907 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3908 lastUpdate_ = value;
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3909 }
5582 17da828f9443 removed FindResponse::Item::level_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5581 diff changeset	3910 if (request.GetLevel() == ResourceType_Series)
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3911 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3912 if (item.LookupMetadata(value, MetadataType_Series_ExpectedNumberOfInstances))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3913 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3914 expectedNumberOfInstances_ = boost::lexical_cast<int>(value);
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3915 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3916 }
5582 17da828f9443 removed FindResponse::Item::level_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5581 diff changeset	3917 if (request.GetLevel() == ResourceType_Instance)
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3918 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3919 if (item.LookupMetadata(value, MetadataType_Instance_IndexInSeries))
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3920 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3921 indexInSeries_ = boost::lexical_cast<int>(value);
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3922 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3923 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3924 }
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3925
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3926 if (request.HasResponseContent(FindRequest::ResponseContent_Labels))
5568 b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3927 {
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3928 labels_ = item.GetLabels();
b0b5546f1b9f find refactor: re-use existing code. /studies?expand is almost fully implemented with new code Alain Mazy <am@orthanc.team> parents: 5554 diff changeset	3929 }
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3930
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3931 if (request.HasResponseContent(FindRequest::ResponseContent_Attachments))
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3932 {
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3933 FileInfo attachment;
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3934 if (item.LookupAttachment(attachment, FileContentType_Dicom))
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3935 {
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3936 fileSize_ = attachment.GetUncompressedSize();
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3937 fileUuid_ = attachment.GetUuid();
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3938 }
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3939 }
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3940
5583 74cc31c8db2b removed FindResponse::Item::responseContent_ Sebastien Jodogne <s.jodogne@gmail.com> parents: 5582 diff changeset	3941 if (request.HasResponseContent(FindRequest::ResponseContent_ChildrenMetadata))
5574 5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3942 {
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3943 // TODO-FIND: the status_ is normally obtained from transaction.GetSeriesStatus(internalId, i)
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3944 // but, that's an heavy operation for something that is rarely used -> we should have dedicated SQL code
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3945 // to compute it AFAP and we should compute it only if the user request it !
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3946 }
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3947
5a13483d12c5 find-refactoring: attachments Alain Mazy <am@orthanc.team> parents: 5569 diff changeset	3948 // TODO-FIND: continue: isStable_, status_
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5526 diff changeset	3949 }
4586 1d96fe7e054e taking StatelessDatabaseOperations out of ServerIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3950 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5583:74cc31c8db2b find-refactoring