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

annotate OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5758:ca06dde85358 large-queries

merged find-refactoring -> large-queries

author	Alain Mazy <am@orthanc.team>
date	Thu, 05 Sep 2024 18:52:27 +0200
parents	5463c3ae3235 717acb0ea546
children	d52b3f394f69

rev	line source
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1847 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1288 6e7e5ed91c2d upgrade to year 2015 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1286 diff changeset	4 * Department, University Hospital of Liege, Belgium
5640 f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5521 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
f7adfb22e20e updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 5521 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
5485 48b8dae6dc77 upgrade to year 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 5256 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * modify it under the terms of the GNU General Public License as
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * published by the Free Software Foundation, either version 3 of the
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * License, or (at your option) any later version.
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * General Public License for more details.
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * You should have received a copy of the GNU General Public License
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
3093 2e1808b6146a reorganization of folders Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	24 #include "../PrecompiledHeadersServer.h"
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	25 #include "SQLiteDatabaseWrapper.h"
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26
4045 05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	27 #include "../../../OrthancFramework/Sources/DicomFormat/DicomArray.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	28 #include "../../../OrthancFramework/Sources/Logging.h"
05b8fd21089c fix path Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	29 #include "../../../OrthancFramework/Sources/SQLite/Transaction.h"
3093 2e1808b6146a reorganization of folders Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	30 #include "../Search/ISqlLookupFormatter.h"
2e1808b6146a reorganization of folders Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	31 #include "../ServerToolbox.h"
5554 12d8a1a266e9 introduction of FindRequest and FindResponse Sebastien Jodogne <s.jodogne@gmail.com> parents: 5521 diff changeset	32 #include "Compatibility/GenericFind.h"
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	33 #include "Compatibility/ICreateInstance.h"
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	34 #include "Compatibility/IGetChildrenMetadata.h"
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	35 #include "Compatibility/ILookupResourceAndParent.h"
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	36 #include "Compatibility/ISetResourcesContent.h"
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	37 #include "VoidDatabaseListener.h"
3093 2e1808b6146a reorganization of folders Sebastien Jodogne <s.jodogne@gmail.com> parents: 3080 diff changeset	38
4032 058b5ade8acd renaming embedded resources Sebastien Jodogne <s.jodogne@gmail.com> parents: 4031 diff changeset	39 #include <OrthancServerResources.h>
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 #include <stdio.h>
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	42 #include <boost/lexical_cast.hpp>
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	43
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 namespace Orthanc
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	45 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	46 class SQLiteDatabaseWrapper::LookupFormatter : public ISqlLookupFormatter
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47 {
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	48 private:
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	49 std::list<std::string> values_;
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	50
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	51 public:
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	52 virtual std::string GenerateParameter(const std::string& value) ORTHANC_OVERRIDE
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	53 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	54 values_.push_back(value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	55 return "?";
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	56 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	57
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	58 virtual std::string FormatResourceType(ResourceType level) ORTHANC_OVERRIDE
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	59 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	60 return boost::lexical_cast<std::string>(level);
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	61 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	62
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	63 virtual std::string FormatWildcardEscape() ORTHANC_OVERRIDE
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	64 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	65 return "ESCAPE '\\'";
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	66 }
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	67
4817 b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	68 virtual bool IsEscapeBrackets() const ORTHANC_OVERRIDE
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	69 {
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	70 return false;
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	71 }
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	72
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	73 void Bind(SQLite::Statement& statement) const
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	74 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	75 size_t pos = 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	76
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	77 for (std::list<std::string>::const_iterator
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	78 it = values_.begin(); it != values_.end(); ++it, pos++)
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	79 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	80 statement.BindString(pos, *it);
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	81 }
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	82 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	83 };
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	84
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	85
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	86 class SQLiteDatabaseWrapper::SignalRemainingAncestor : public SQLite::IScalarFunction
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	87 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	88 private:
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	89 bool hasRemainingAncestor_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	90 std::string remainingPublicId_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	91 ResourceType remainingType_;
660 f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 616 diff changeset	92
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	93 public:
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	94 SignalRemainingAncestor() :
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	95 hasRemainingAncestor_(false)
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	96 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	97 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	98
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	99 void Reset()
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	100 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	101 hasRemainingAncestor_ = false;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	102 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	103
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	104 virtual const char* GetName() const ORTHANC_OVERRIDE
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	105 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	106 return "SignalRemainingAncestor";
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	107 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	108
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	109 virtual unsigned int GetCardinality() const ORTHANC_OVERRIDE
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	110 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	111 return 2;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	112 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	113
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	114 virtual void Compute(SQLite::FunctionContext& context) ORTHANC_OVERRIDE
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	115 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	116 CLOG(TRACE, SQLITE) << "There exists a remaining ancestor with public ID \""
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	117 << context.GetStringValue(0) << "\" of type "
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	118 << context.GetIntValue(1);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	119
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	120 if (!hasRemainingAncestor_ \|\|
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	121 remainingType_ >= context.GetIntValue(1))
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	122 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	123 hasRemainingAncestor_ = true;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	124 remainingPublicId_ = context.GetStringValue(0);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	125 remainingType_ = static_cast<ResourceType>(context.GetIntValue(1));
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	126 }
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	127 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	128
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	129 bool HasRemainingAncestor() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	130 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	131 return hasRemainingAncestor_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	132 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	133
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	134 const std::string& GetRemainingAncestorId() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	135 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	136 assert(hasRemainingAncestor_);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	137 return remainingPublicId_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	138 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	139
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	140 ResourceType GetRemainingAncestorType() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	141 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	142 assert(hasRemainingAncestor_);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	143 return remainingType_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	144 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	145 };
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	146
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	147
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	148 class SQLiteDatabaseWrapper::TransactionBase :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	149 public SQLiteDatabaseWrapper::UnitTestsTransaction,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	150 public Compatibility::ICreateInstance,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	151 public Compatibility::IGetChildrenMetadata,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	152 public Compatibility::ILookupResourceAndParent,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	153 public Compatibility::ISetResourcesContent
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	154 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	155 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	156 void AnswerLookup(std::list<std::string>& resourcesId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	157 std::list<std::string>& instancesId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	158 ResourceType level)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	159 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	160 resourcesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	161 instancesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	162
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	163 std::unique_ptr<SQLite::Statement> statement;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	164
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	165 switch (level)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	166 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	167 case ResourceType_Patient:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	168 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	169 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	170 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	171 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	172 "SELECT patients.publicId, instances.publicID FROM Lookup AS patients "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	173 "INNER JOIN Resources studies ON patients.internalId=studies.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	174 "INNER JOIN Resources series ON studies.internalId=series.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	175 "INNER JOIN Resources instances ON series.internalId=instances.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	176 "GROUP BY patients.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	177
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	178 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	179 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	180
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	181 case ResourceType_Study:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	182 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	183 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	184 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	185 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	186 "SELECT studies.publicId, instances.publicID FROM Lookup AS studies "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	187 "INNER JOIN Resources series ON studies.internalId=series.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	188 "INNER JOIN Resources instances ON series.internalId=instances.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	189 "GROUP BY studies.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	190
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	191 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	192 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	193
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	194 case ResourceType_Series:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	195 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	196 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	197 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	198 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	199 "SELECT series.publicId, instances.publicID FROM Lookup AS series "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	200 "INNER JOIN Resources instances ON series.internalId=instances.parentId "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	201 "GROUP BY series.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	202
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	203 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	204 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	205
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	206 case ResourceType_Instance:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	207 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	208 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	209 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	210 db_, SQLITE_FROM_HERE, "SELECT publicId, publicId FROM Lookup"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	211
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	212 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	213 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	214
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	215 default:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	216 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	217 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	218
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	219 assert(statement.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	220
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	221 while (statement->Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	222 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	223 resourcesId.push_back(statement->ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	224 instancesId.push_back(statement->ColumnString(1));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	225 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	226 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	227
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	228
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	229 void ClearTable(const std::string& tableName)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	230 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	231 db_.Execute("DELETE FROM " + tableName);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	232 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	233
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	234
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	235 void GetChangesInternal(std::list<ServerIndexChange>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	236 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	237 SQLite::Statement& s,
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	238 uint32_t limit,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	239 bool returnFirstResults) // the statement usually returns limit+1 results while we only need the limit results -> we need to know which ones to return, the firsts or the lasts
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	240 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	241 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	242
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	243 while (s.Step())
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	244 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	245 int64_t seq = s.ColumnInt64(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	246 ChangeType changeType = static_cast<ChangeType>(s.ColumnInt(1));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	247 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(3));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	248 const std::string& date = s.ColumnString(4);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	249
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	250 int64_t internalId = s.ColumnInt64(2);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	251 std::string publicId = GetPublicId(internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	252
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	253 target.push_back(ServerIndexChange(seq, changeType, resourceType, publicId, date));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	254 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	255
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	256 done = target.size() <= limit; // 'done' means "there are no more other changes of this type in that direction (depending on since/to)"
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	257
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	258 // if we have retrieved more changes than requested -> cleanup
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	259 if (target.size() > limit)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	260 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	261 assert(target.size() == limit+1); // the statement should only request 1 element more
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	262
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	263 if (returnFirstResults)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	264 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	265 target.pop_back();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	266 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	267 else
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	268 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	269 target.pop_front();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	270 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	271 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	272 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	273
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	274
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	275 void GetExportedResourcesInternal(std::list<ExportedResource>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	276 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	277 SQLite::Statement& s,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	278 uint32_t limit)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	279 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	280 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	281
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	282 while (target.size() < limit && s.Step())
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	283 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	284 int64_t seq = s.ColumnInt64(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	285 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	286 std::string publicId = s.ColumnString(2);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	287
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	288 ExportedResource resource(seq,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	289 resourceType,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	290 publicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	291 s.ColumnString(3), // modality
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	292 s.ColumnString(8), // date
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	293 s.ColumnString(4), // patient ID
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	294 s.ColumnString(5), // study instance UID
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	295 s.ColumnString(6), // series instance UID
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	296 s.ColumnString(7)); // sop instance UID
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	297
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	298 target.push_back(resource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	299 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	300
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	301 done = !(target.size() == limit && s.Step());
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	302 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	303
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	304
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	305 void GetChildren(std::list<std::string>& childrenPublicIds,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	306 int64_t id)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	307 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	308 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE parentId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	309 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	310
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	311 childrenPublicIds.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	312 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	313 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	314 childrenPublicIds.push_back(s.ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	315 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	316 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	317
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	318 boost::mutex::scoped_lock lock_;
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	319 IDatabaseListener& listener_;
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	320 SignalRemainingAncestor& signalRemainingAncestor_;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	321
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	322 public:
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	323 TransactionBase(boost::mutex& mutex,
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	324 SQLite::Connection& db,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	325 IDatabaseListener& listener,
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	326 SignalRemainingAncestor& signalRemainingAncestor) :
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	327 UnitTestsTransaction(db),
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	328 lock_(mutex),
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	329 listener_(listener),
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	330 signalRemainingAncestor_(signalRemainingAncestor)
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	331 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	332 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	333
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	334 IDatabaseListener& GetListener() const
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	335 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	336 return listener_;
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	337 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	338
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	339
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	340 virtual void AddAttachment(int64_t id,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	341 const FileInfo& attachment,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	342 int64_t revision) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	343 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	344 // TODO - REVISIONS
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	345 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO AttachedFiles (id, fileType, uuid, compressedSize, uncompressedSize, compressionType, uncompressedMD5, compressedMD5) VALUES(?, ?, ?, ?, ?, ?, ?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	346 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	347 s.BindInt(1, attachment.GetContentType());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	348 s.BindString(2, attachment.GetUuid());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	349 s.BindInt64(3, attachment.GetCompressedSize());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	350 s.BindInt64(4, attachment.GetUncompressedSize());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	351 s.BindInt(5, attachment.GetCompressionType());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	352 s.BindString(6, attachment.GetUncompressedMD5());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	353 s.BindString(7, attachment.GetCompressedMD5());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	354 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	355 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	356
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	357
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	358 virtual void ApplyLookupResources(std::list<std::string>& resourcesId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	359 std::list<std::string>* instancesId,
5680 68fc5af30c03 added container class DatabaseConstraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	360 const DatabaseConstraints& lookup,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	361 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	362 const std::set<std::string>& labels,
a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	363 LabelsConstraint labelsConstraint,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	364 uint32_t limit) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	365 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	366 LookupFormatter formatter;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	367
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	368 std::string sql;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	369 LookupFormatter::Apply(sql, formatter, lookup, queryLevel, labels, labelsConstraint, limit);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	370
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	371 sql = "CREATE TEMPORARY TABLE Lookup AS " + sql;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	372
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	373 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	374 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DROP TABLE IF EXISTS Lookup");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	375 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	376 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	377
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	378 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	379 SQLite::Statement statement(db_, sql);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	380 formatter.Bind(statement);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	381 statement.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	382 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	383
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	384 if (instancesId != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	385 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	386 AnswerLookup(resourcesId, *instancesId, queryLevel);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	387 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	388 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	389 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	390 resourcesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	391
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	392 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Lookup");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	393
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	394 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	395 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	396 resourcesId.push_back(s.ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	397 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	398 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	399 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	400
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	401 virtual void ExecuteFind(FindResponse& response,
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	402 const FindRequest& request,
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	403 const Capabilities& capabilities) ORTHANC_OVERRIDE
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	404 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	405 const ResourceType requestLevel = request.GetLevel();
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	406 std::string sql;
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	407
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	408 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	409 // clean previous lookup table
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	410 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DROP TABLE IF EXISTS Lookup");
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	411 s.Run();
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	412 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	413
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	414 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	415 // extract the resource id of interest by executing the lookup
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	416 LookupFormatter formatter;
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	417 LookupFormatter::Apply(sql, formatter, request);
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	418
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	419 sql = "CREATE TEMPORARY TABLE Lookup AS " + sql;
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	420
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	421 SQLite::Statement statement(db_, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	422 formatter.Bind(statement);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	423 statement.Run();
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	424
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	425 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId, internalId FROM Lookup");
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	426 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	427 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	428 response.Add(new FindResponse::Resource(requestLevel, s.ColumnInt64(1), s.ColumnString(0)));
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	429 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	430 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	431
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	432 // need MainDicomTags from resource ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	433 if (request.IsRetrieveMainDicomTags())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	434 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	435 sql = "SELECT id, tagGroup, tagElement, value "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	436 "FROM MainDicomTags "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	437 "INNER JOIN Lookup ON MainDicomTags.id = Lookup.internalId";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	438
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	439 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	440 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	441 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	442 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	443 res.AddStringDicomTag(requestLevel,
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	444 static_cast<uint16_t>(s.ColumnInt(1)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	445 static_cast<uint16_t>(s.ColumnInt(2)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	446 s.ColumnString(3));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	447 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	448 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	449
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	450 // need MainDicomTags from parent ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	451 if (requestLevel > ResourceType_Patient && request.GetParentSpecification(static_cast<ResourceType>(requestLevel - 1)).IsRetrieveMainDicomTags())
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	452 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	453 sql = "SELECT currentLevel.internalId, tagGroup, tagElement, value "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	454 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	455 "INNER JOIN Resources currentLevel ON Lookup.internalId = currentLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	456 "INNER JOIN Lookup ON MainDicomTags.id = currentLevel.parentId";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	457
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	458 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	459 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	460 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	461 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	462 res.AddStringDicomTag(static_cast<ResourceType>(requestLevel - 1),
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	463 static_cast<uint16_t>(s.ColumnInt(1)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	464 static_cast<uint16_t>(s.ColumnInt(2)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	465 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	466 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	467 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	468
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	469 // need MainDicomTags from grandparent ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	470 if (requestLevel > ResourceType_Study && request.GetParentSpecification(static_cast<ResourceType>(requestLevel - 2)).IsRetrieveMainDicomTags())
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	471 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	472 sql = "SELECT currentLevel.internalId, tagGroup, tagElement, value "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	473 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	474 "INNER JOIN Resources currentLevel ON Lookup.internalId = currentLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	475 "INNER JOIN Resources parentLevel ON currentLevel.parentId = parentLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	476 "INNER JOIN Lookup ON MainDicomTags.id = parentLevel.parentId";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	477
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	478 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	479 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	480 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	481 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	482 res.AddStringDicomTag(static_cast<ResourceType>(requestLevel - 2),
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	483 static_cast<uint16_t>(s.ColumnInt(1)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	484 static_cast<uint16_t>(s.ColumnInt(2)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	485 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	486 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	487 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	488
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	489 // need MainDicomTags from children ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	490 if (requestLevel <= ResourceType_Series && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 1)).GetMainDicomTags().size() > 0)
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	491 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	492 sql = "SELECT Lookup.internalId, tagGroup, tagElement, value "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	493 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	494 "INNER JOIN Resources childLevel ON childLevel.parentId = Lookup.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	495 "INNER JOIN Lookup ON MainDicomTags.id = childLevel.internalId ";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	496
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	497 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	498 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	499 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	500 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	501 res.AddChildrenMainDicomTagValue(static_cast<ResourceType>(requestLevel + 1),
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	502 DicomTag(static_cast<uint16_t>(s.ColumnInt(1)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	503 static_cast<uint16_t>(s.ColumnInt(2))),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	504 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	505 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	506 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	507
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	508 // need MainDicomTags from grandchildren ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	509 if (requestLevel <= ResourceType_Study && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 2)).GetMainDicomTags().size() > 0)
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	510 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	511 sql = "SELECT Lookup.internalId, tagGroup, tagElement, value "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	512 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	513 "INNER JOIN Resources childLevel ON childLevel.parentId = Lookup.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	514 "INNER JOIN Resources grandChildLevel ON childLevel.parentId = Lookup.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	515 "INNER JOIN Lookup ON MainDicomTags.id = grandChildLevel.internalId ";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	516
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	517 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	518 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	519 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	520 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	521 res.AddChildrenMainDicomTagValue(static_cast<ResourceType>(requestLevel + 2),
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	522 DicomTag(static_cast<uint16_t>(s.ColumnInt(1)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	523 static_cast<uint16_t>(s.ColumnInt(2))),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	524 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	525 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	526 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	527
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	528 // need parent identifier ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	529 if (request.IsRetrieveParentIdentifier())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	530 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	531 sql = "SELECT currentLevel.internalId, parentLevel.publicId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	532 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	533 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	534 "INNER JOIN Resources parentLevel ON currentLevel.parentId = parentLevel.internalId ";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	535
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	536 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	537 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	538 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	539 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	540 res.SetParentIdentifier(s.ColumnString(1));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	541 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	542 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	543
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	544 // need resource metadata ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	545 if (request.IsRetrieveMetadata())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	546 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	547 sql = "SELECT id, type, value "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	548 "FROM Metadata "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	549 "INNER JOIN Lookup ON Metadata.id = Lookup.internalId";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	550
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	551 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	552 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	553 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	554 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	555 res.AddMetadata(requestLevel,
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	556 static_cast<MetadataType>(s.ColumnInt(1)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	557 s.ColumnString(2));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	558 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	559 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	560
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	561 // need resource labels ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	562 if (request.IsRetrieveLabels())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	563 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	564 sql = "SELECT Lookup.internalId, label "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	565 "FROM Labels "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	566 "INNER JOIN Lookup ON Labels.id = Lookup.internalId";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	567
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	568 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	569 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	570 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	571 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	572 res.AddLabel(s.ColumnString(1));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	573 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	574 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	575
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	576 // need one instance identifier ? TODO: it might be actually more interesting to retrieve directly the attachment ids ....
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	577 if (request.IsRetrieveOneInstanceIdentifier())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	578 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	579 if (requestLevel == ResourceType_Series)
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	580 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	581 sql = "SELECT Lookup.internalId, childLevel.publicId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	582 "FROM Resources AS childLevel "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	583 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId ";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	584
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	585 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	586 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	587 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	588 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	589 res.AddChildIdentifier(ResourceType_Instance, s.ColumnString(1));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	590 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	591 }
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	592 else if (requestLevel == ResourceType_Study)
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	593 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	594 sql = "SELECT Lookup.internalId, grandChildLevel.publicId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	595 "FROM Resources AS grandChildLevel "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	596 "INNER JOIN Resources childLevel ON grandChildLevel.parentId = childLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	597 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId ";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	598
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	599 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	600 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	601 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	602 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	603 res.AddChildIdentifier(ResourceType_Instance, s.ColumnString(1));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	604 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	605 }
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	606 else if (requestLevel == ResourceType_Patient)
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	607 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	608 sql = "SELECT Lookup.internalId, grandGrandChildLevel.publicId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	609 "FROM Resources AS grandGrandChildLevel "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	610 "INNER JOIN Resources grandChildLevel ON grandGrandChildLevel.parentId = grandChildLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	611 "INNER JOIN Resources childLevel ON grandChildLevel.parentId = childLevel.internalId "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	612 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId ";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	613
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	614 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	615 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	616 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	617 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	618 res.AddChildIdentifier(ResourceType_Instance, s.ColumnString(1));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	619 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	620 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	621 else
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	622 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	623 throw OrthancException(ErrorCode_InternalError);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	624 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	625 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	626
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	627 // need children metadata ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	628 if (requestLevel <= ResourceType_Series && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 1)).GetMetadata().size() > 0)
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	629 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	630 sql = "SELECT Lookup.internalId, type, value "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	631 "FROM Metadata "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	632 "INNER JOIN Lookup ON Lookup.internalId = childLevel.parentId "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	633 "INNER JOIN Resources childLevel ON childLevel.internalId = Metadata.id";
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	634
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	635 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	636 while (s.Step())
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	637 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	638 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	639 res.AddChildrenMetadataValue(static_cast<ResourceType>(requestLevel + 1),
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	640 static_cast<MetadataType>(s.ColumnInt(1)),
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	641 s.ColumnString(2));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	642 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	643 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	644
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	645 // need grandchildren metadata ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	646 if (requestLevel <= ResourceType_Study && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 2)).GetMetadata().size() > 0)
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	647 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	648 sql = "SELECT Lookup.internalId, type, value "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	649 "FROM Metadata "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	650 "INNER JOIN Lookup ON Lookup.internalId = childLevel.parentId "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	651 "INNER JOIN Resources childLevel ON childLevel.internalId = grandChildLevel.parentId "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	652 "INNER JOIN Resources grandChildLevel ON grandChildLevel.internalId = Metadata.id";
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	653
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	654 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	655 while (s.Step())
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	656 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	657 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	658 res.AddChildrenMetadataValue(static_cast<ResourceType>(requestLevel + 2),
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	659 static_cast<MetadataType>(s.ColumnInt(1)),
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	660 s.ColumnString(2));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	661 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	662 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	663
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	664 // need children identifiers ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	665 if (requestLevel <= ResourceType_Series && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 1)).IsRetrieveIdentifiers())
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	666 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	667 sql = "SELECT Lookup.internalId, childLevel.publicId "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	668 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	669 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	670 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId ";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	671
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	672 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	673 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	674 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	675 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	676 res.AddChildIdentifier(static_cast<ResourceType>(requestLevel + 1), s.ColumnString(1));
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	677 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	678 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	679
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	680 // need grandchildren identifiers ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	681 if (requestLevel <= ResourceType_Study && request.GetChildrenSpecification(static_cast<ResourceType>(requestLevel + 2)).IsRetrieveIdentifiers())
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	682 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	683 sql = "SELECT Lookup.internalId, grandChildLevel.publicId "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	684 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	685 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	686 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	687 "INNER JOIN Resources grandChildLevel ON childLevel.internalId = grandChildLevel.parentId ";
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	688
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	689 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	690 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	691 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	692 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	693 res.AddChildIdentifier(static_cast<ResourceType>(requestLevel + 2), s.ColumnString(1));
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	694 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	695 }
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	696
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	697 // need resource attachments ?
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	698 if (request.IsRetrieveAttachments())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	699 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	700 sql = "SELECT Lookup.internalId, fileType, uuid, uncompressedSize, compressedSize, compressionType, uncompressedMD5, compressedMD5 "
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	701 "FROM AttachedFiles "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	702 "INNER JOIN Lookup ON AttachedFiles.id = Lookup.internalId";
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	703
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	704 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	705 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	706 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	707 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	708 FileInfo file(s.ColumnString(2), static_cast<FileContentType>(s.ColumnInt(1)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	709 s.ColumnInt64(3), s.ColumnString(6),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	710 static_cast<CompressionType>(s.ColumnInt(5)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	711 s.ColumnInt64(4), s.ColumnString(7));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	712 res.AddAttachment(file);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	713 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	714
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	715 }
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	716 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	717
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	718
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	719
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	720 // From the "ICreateInstance" interface
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	721 virtual void AttachChild(int64_t parent,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	722 int64_t child) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	723 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	724 SQLite::Statement s(db_, SQLITE_FROM_HERE, "UPDATE Resources SET parentId = ? WHERE internalId = ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	725 s.BindInt64(0, parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	726 s.BindInt64(1, child);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	727 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	728 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	729
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	730
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	731 virtual void ClearChanges() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	732 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	733 ClearTable("Changes");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	734 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	735
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	736 virtual void ClearExportedResources() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	737 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	738 ClearTable("ExportedResources");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	739 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	740
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	741
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	742 virtual void ClearMainDicomTags(int64_t id) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	743 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	744 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	745 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM DicomIdentifiers WHERE id=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	746 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	747 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	748 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	749
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	750 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	751 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM MainDicomTags WHERE id=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	752 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	753 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	754 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	755 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	756
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	757
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	758 virtual bool CreateInstance(CreateInstanceResult& result,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	759 int64_t& instanceId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	760 const std::string& patient,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	761 const std::string& study,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	762 const std::string& series,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	763 const std::string& instance) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	764 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	765 return ICreateInstance::Apply
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	766 (*this, result, instanceId, patient, study, series, instance);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	767 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	768
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	769
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	770 // From the "ICreateInstance" interface
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	771 virtual int64_t CreateResource(const std::string& publicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	772 ResourceType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	773 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	774 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Resources (internalId, resourceType, publicId, parentId) VALUES(NULL, ?, ?, NULL)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	775 s.BindInt(0, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	776 s.BindString(1, publicId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	777 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	778 return db_.GetLastInsertRowId();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	779 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	780
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	781
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	782 virtual void DeleteAttachment(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	783 FileContentType attachment) ORTHANC_OVERRIDE
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	784 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	785 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM AttachedFiles WHERE id=? AND fileType=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	786 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	787 s.BindInt(1, attachment);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	788 s.Run();
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	789 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	790
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	791
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	792 virtual void DeleteMetadata(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	793 MetadataType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	794 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	795 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Metadata WHERE id=? and type=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	796 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	797 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	798 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	799 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	800
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	801
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	802 virtual void DeleteResource(int64_t id) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	803 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	804 signalRemainingAncestor_.Reset();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	805
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	806 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Resources WHERE internalId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	807 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	808 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	809
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	810 if (signalRemainingAncestor_.HasRemainingAncestor())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	811 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	812 listener_.SignalRemainingAncestor(signalRemainingAncestor_.GetRemainingAncestorType(),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	813 signalRemainingAncestor_.GetRemainingAncestorId());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	814 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	815 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	816
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	817
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	818 virtual void GetAllMetadata(std::map<MetadataType, std::string>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	819 int64_t id) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	820 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	821 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	822
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	823 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT type, value FROM Metadata WHERE id=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	824 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	825
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	826 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	827 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	828 MetadataType key = static_cast<MetadataType>(s.ColumnInt(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	829 target[key] = s.ColumnString(1);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	830 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	831 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	832
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	833
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	834 virtual void GetAllPublicIds(std::list<std::string>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	835 ResourceType resourceType) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	836 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	837 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE resourceType=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	838 s.BindInt(0, resourceType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	839
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	840 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	841 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	842 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	843 target.push_back(s.ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	844 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	845 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	846
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	847
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	848 virtual void GetAllPublicIds(std::list<std::string>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	849 ResourceType resourceType,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	850 int64_t since,
055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	851 uint32_t limit) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	852 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	853 if (limit == 0)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	854 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	855 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	856 return;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	857 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	858
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	859 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	860 "SELECT publicId FROM Resources WHERE "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	861 "resourceType=? LIMIT ? OFFSET ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	862 s.BindInt(0, resourceType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	863 s.BindInt64(1, limit);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	864 s.BindInt64(2, since);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	865
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	866 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	867 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	868 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	869 target.push_back(s.ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	870 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	871 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	872
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	873
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	874 virtual void GetChanges(std::list<ServerIndexChange>& target /out/,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	875 bool& done /out/,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	876 int64_t since,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	877 uint32_t limit) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	878 {
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	879 GetChangesExtended(target, done, since, -1, limit, ChangeType_INTERNAL_All);
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	880 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	881
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	882 virtual void GetChangesExtended(std::list<ServerIndexChange>& target /out/,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	883 bool& done /out/,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	884 int64_t since,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	885 int64_t to,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	886 uint32_t limit,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	887 ChangeType filterType) ORTHANC_OVERRIDE
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	888 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	889 std::vector<std::string> filters;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	890 bool hasSince = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	891 bool hasTo = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	892 bool hasFilterType = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	893
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	894 if (since > 0)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	895 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	896 hasSince = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	897 filters.push_back("seq>?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	898 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	899 if (to != -1)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	900 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	901 hasTo = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	902 filters.push_back("seq<=?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	903 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	904 if (filterType != ChangeType_INTERNAL_All)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	905 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	906 hasFilterType = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	907 filters.push_back("changeType=?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	908 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	909
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	910 std::string filtersString;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	911 if (filters.size() > 0)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	912 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	913 Toolbox::JoinStrings(filtersString, filters, " AND ");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	914 filtersString = "WHERE " + filtersString;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	915 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	916
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	917 std::string sql;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	918 bool returnFirstResults;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	919 if (hasTo && !hasSince)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	920 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	921 // in this case, we want the largest values in the LIMIT clause but we want them ordered in ascending order
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	922 sql = "SELECT * FROM (SELECT * FROM Changes " + filtersString + " ORDER BY seq DESC LIMIT ?) ORDER BY seq ASC";
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	923 returnFirstResults = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	924 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	925 else
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	926 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	927 // default query: we want the smallest values ordered in ascending order
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	928 sql = "SELECT * FROM Changes " + filtersString + " ORDER BY seq ASC LIMIT ?";
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	929 returnFirstResults = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	930 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	931
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	932 SQLite::Statement s(db_, SQLITE_FROM_HERE_DYNAMIC(sql), sql);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	933
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	934 int paramCounter = 0;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	935 if (hasSince)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	936 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	937 s.BindInt64(paramCounter++, since);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	938 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	939 if (hasTo)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	940 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	941 s.BindInt64(paramCounter++, to);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	942 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	943 if (hasFilterType)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	944 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	945 s.BindInt(paramCounter++, filterType);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	946 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	947 s.BindInt(paramCounter++, limit + 1); // we take limit+1 because we use the +1 to know if "Done" must be set to true
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	948 GetChangesInternal(target, done, s, limit, returnFirstResults);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	949 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	950
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	951
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	952 virtual void GetChildrenMetadata(std::list<std::string>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	953 int64_t resourceId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	954 MetadataType metadata) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	955 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	956 IGetChildrenMetadata::Apply(*this, target, resourceId, metadata);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	957 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	958
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	959
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	960 virtual void GetChildrenInternalId(std::list<int64_t>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	961 int64_t id) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	962 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	963 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.internalId FROM Resources AS a, Resources AS b "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	964 "WHERE a.parentId = b.internalId AND b.internalId = ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	965 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	966
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	967 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	968
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	969 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	970 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	971 target.push_back(s.ColumnInt64(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	972 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	973 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	974
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	975
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	976 virtual void GetChildrenPublicId(std::list<std::string>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	977 int64_t id) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	978 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	979 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	980 "WHERE a.parentId = b.internalId AND b.internalId = ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	981 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	982
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	983 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	984
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	985 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	986 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	987 target.push_back(s.ColumnString(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	988 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	989 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	990
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	991
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	992 virtual void GetExportedResources(std::list<ExportedResource>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	993 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	994 int64_t since,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	995 uint32_t limit) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	996 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	997 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	998 "SELECT * FROM ExportedResources WHERE seq>? ORDER BY seq LIMIT ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	999 s.BindInt64(0, since);
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	1000 s.BindInt(1, limit + 1);
055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	1001 GetExportedResourcesInternal(target, done, s, limit);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1002 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1003
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1004
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1005 virtual void GetLastChange(std::list<ServerIndexChange>& target /out/) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1006 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1007 bool done; // Ignored
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1008 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM Changes ORDER BY seq DESC LIMIT 1");
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1009 GetChangesInternal(target, done, s, 1, true);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1010 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1011
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1012
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1013 int64_t GetLastChangeIndex() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1014 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1015 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1016 "SELECT seq FROM sqlite_sequence WHERE name='Changes'");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1017
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1018 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1019 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1020 int64_t c = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1021 assert(!s.Step());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1022 return c;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1023 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1024 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1025 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1026 // No change has been recorded so far in the database
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1027 return 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1028 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1029 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1030
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1031
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1032 virtual void GetLastExportedResource(std::list<ExportedResource>& target) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1033 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1034 bool done; // Ignored
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1035 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1036 "SELECT * FROM ExportedResources ORDER BY seq DESC LIMIT 1");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1037 GetExportedResourcesInternal(target, done, s, 1);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1038 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1039
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1040
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1041 virtual void GetMainDicomTags(DicomMap& map,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1042 int64_t id) ORTHANC_OVERRIDE
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1043 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1044 map.Clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1045
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1046 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM MainDicomTags WHERE id=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1047 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1048 while (s.Step())
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1049 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1050 map.SetValue(s.ColumnInt(1),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1051 s.ColumnInt(2),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1052 s.ColumnString(3), false);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1053 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1054 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1055
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1056
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1057 virtual std::string GetPublicId(int64_t resourceId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1058 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1059 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1060 "SELECT publicId FROM Resources WHERE internalId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1061 s.BindInt64(0, resourceId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1062
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1063 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1064 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1065 return s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1066 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1067 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1068 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1069 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1070 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1071 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1072
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1073
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1074 virtual uint64_t GetResourcesCount(ResourceType resourceType) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1075 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1076 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1077 "SELECT COUNT(*) FROM Resources WHERE resourceType=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1078 s.BindInt(0, resourceType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1079
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1080 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1081 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1082 return 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1083 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1084 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1085 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1086 int64_t c = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1087 assert(!s.Step());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1088 return c;
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1089 }
2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1090 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1091
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1092
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1093 virtual ResourceType GetResourceType(int64_t resourceId) ORTHANC_OVERRIDE
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1094 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1095 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1096 "SELECT resourceType FROM Resources WHERE internalId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1097 s.BindInt64(0, resourceId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1098
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1099 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1100 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1101 return static_cast<ResourceType>(s.ColumnInt(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1102 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1103 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1104 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1105 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1106 }
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1107 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1108
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1109
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1110 virtual uint64_t GetTotalCompressedSize() ORTHANC_OVERRIDE
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	1111 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1112 // Old SQL query that was used in Orthanc <= 1.5.0:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1113 // SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(compressedSize) FROM AttachedFiles");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1114
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1115 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT value FROM GlobalIntegers WHERE key=0");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1116 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1117 return static_cast<uint64_t>(s.ColumnInt64(0));
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	1118 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1119
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1120
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1121 virtual uint64_t GetTotalUncompressedSize() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1122 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1123 // Old SQL query that was used in Orthanc <= 1.5.0:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1124 // SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(uncompressedSize) FROM AttachedFiles");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1125
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1126 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT value FROM GlobalIntegers WHERE key=1");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1127 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1128 return static_cast<uint64_t>(s.ColumnInt64(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1129 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1130
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1131
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1132 virtual bool IsDiskSizeAbove(uint64_t threshold) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1133 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1134 return GetTotalCompressedSize() > threshold;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1135 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1136
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1137
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1138 virtual bool IsProtectedPatient(int64_t internalId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1139 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1140 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1141 "SELECT * FROM PatientRecyclingOrder WHERE patientId = ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1142 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1143 return !s.Step();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1144 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1145
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1146
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1147 virtual void ListAvailableAttachments(std::set<FileContentType>& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1148 int64_t id) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1149 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1150 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1151
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1152 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1153 "SELECT fileType FROM AttachedFiles WHERE id=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1154 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1155
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1156 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1157 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1158 target.insert(static_cast<FileContentType>(s.ColumnInt(0)));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1159 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1160 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1161
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1162
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1163 virtual void LogChange(ChangeType changeType,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1164 ResourceType resourceType,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1165 int64_t internalId,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1166 const std::string& /* publicId - unused */,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1167 const std::string& date) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1168 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1169 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Changes (seq, changeType, internalId, resourceType, date) VALUES(NULL, ?, ?, ?, ?)");
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1170 s.BindInt(0, changeType);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1171 s.BindInt64(1, internalId);
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1172 s.BindInt(2, resourceType);
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1173 s.BindString(3, date);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1174 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1175 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1176
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1177
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1178 virtual void LogExportedResource(const ExportedResource& resource) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1179 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1180 SQLite::Statement s(db_, SQLITE_FROM_HERE,
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1181 "INSERT INTO ExportedResources (seq, resourceType, publicId, remoteModality, patientId, studyInstanceUid, seriesInstanceUid, sopInstanceUid, date) VALUES(NULL, ?, ?, ?, ?, ?, ?, ?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1182
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1183 s.BindInt(0, resource.GetResourceType());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1184 s.BindString(1, resource.GetPublicId());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1185 s.BindString(2, resource.GetModality());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1186 s.BindString(3, resource.GetPatientId());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1187 s.BindString(4, resource.GetStudyInstanceUid());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1188 s.BindString(5, resource.GetSeriesInstanceUid());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1189 s.BindString(6, resource.GetSopInstanceUid());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1190 s.BindString(7, resource.GetDate());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1191 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1192 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1193
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1194
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1195 virtual bool LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1196 int64_t& revision,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1197 int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1198 FileContentType contentType) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1199 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1200 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1201 "SELECT uuid, uncompressedSize, compressionType, compressedSize, "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1202 "uncompressedMD5, compressedMD5 FROM AttachedFiles WHERE id=? AND fileType=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1203 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1204 s.BindInt(1, contentType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1205
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1206 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1207 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1208 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1209 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1210 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1211 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1212 attachment = FileInfo(s.ColumnString(0),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1213 contentType,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1214 s.ColumnInt64(1),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1215 s.ColumnString(4),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1216 static_cast<CompressionType>(s.ColumnInt(2)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1217 s.ColumnInt64(3),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1218 s.ColumnString(5));
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1219 revision = 0; // TODO - REVISIONS
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1220 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1221 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1222 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1223
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1224
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1225 virtual bool LookupGlobalProperty(std::string& target,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1226 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1227 bool shared) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1228 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1229 // The "shared" info is not used by the SQLite database, as it
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1230 // can only be used by one Orthanc server.
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1231
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1232 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1233 "SELECT value FROM GlobalProperties WHERE property=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1234 s.BindInt(0, property);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1235
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1236 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1237 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1238 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1239 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1240 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1241 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1242 target = s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1243 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1244 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1245 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1246
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1247
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1248 virtual bool LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1249 int64_t& revision,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1250 int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1251 MetadataType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1252 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1253 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1254 "SELECT value FROM Metadata WHERE id=? AND type=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1255 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1256 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1257
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1258 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1259 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1260 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1261 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1262 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1263 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1264 target = s.ColumnString(0);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1265 revision = 0; // TODO - REVISIONS
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1266 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1267 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1268 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1269
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1270
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1271 virtual bool LookupParent(int64_t& parentId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1272 int64_t resourceId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1273 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1274 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1275 "SELECT parentId FROM Resources WHERE internalId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1276 s.BindInt64(0, resourceId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1277
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1278 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1279 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1280 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1281 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1282
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1283 if (s.ColumnIsNull(0))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1284 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1285 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1286 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1287 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1288 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1289 parentId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1290 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1291 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1292 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1293
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1294
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1295 virtual bool LookupResourceAndParent(int64_t& id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1296 ResourceType& type,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1297 std::string& parentPublicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1298 const std::string& publicId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1299 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1300 return ILookupResourceAndParent::Apply(*this, id, type, parentPublicId, publicId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1301 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1302
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1303
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1304 virtual bool LookupResource(int64_t& id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1305 ResourceType& type,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1306 const std::string& publicId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1307 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1308 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1309 "SELECT internalId, resourceType FROM Resources WHERE publicId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1310 s.BindString(0, publicId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1311
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1312 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1313 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1314 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1315 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1316 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1317 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1318 id = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1319 type = static_cast<ResourceType>(s.ColumnInt(1));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1320
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1321 // Check whether there is a single resource with this public id
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1322 assert(!s.Step());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1323
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1324 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1325 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1326 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1327
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1328
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1329 virtual bool SelectPatientToRecycle(int64_t& internalId) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1330 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1331 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1332 "SELECT patientId FROM PatientRecyclingOrder ORDER BY seq ASC LIMIT 1");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1333
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1334 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1335 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1336 // No patient remaining or all the patients are protected
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1337 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1338 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1339 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1340 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1341 internalId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1342 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1343 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1344 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1345
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1346
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1347 virtual bool SelectPatientToRecycle(int64_t& internalId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1348 int64_t patientIdToAvoid) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1349 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1350 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1351 "SELECT patientId FROM PatientRecyclingOrder "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1352 "WHERE patientId != ? ORDER BY seq ASC LIMIT 1");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1353 s.BindInt64(0, patientIdToAvoid);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1354
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1355 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1356 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1357 // No patient remaining or all the patients are protected
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1358 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1359 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1360 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1361 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1362 internalId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1363 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1364 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1365 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1366
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1367
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1368 virtual void SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1369 bool shared,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1370 const std::string& value) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1371 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1372 // The "shared" info is not used by the SQLite database, as it
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1373 // can only be used by one Orthanc server.
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1374
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1375 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR REPLACE INTO GlobalProperties (property, value) VALUES(?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1376 s.BindInt(0, property);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1377 s.BindString(1, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1378 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1379 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1380
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1381
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1382 // From the "ISetResourcesContent" interface
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1383 virtual void SetIdentifierTag(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1384 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1385 const std::string& value) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1386 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1387 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO DicomIdentifiers (id, tagGroup, tagElement, value) VALUES(?, ?, ?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1388 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1389 s.BindInt(1, tag.GetGroup());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1390 s.BindInt(2, tag.GetElement());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1391 s.BindString(3, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1392 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1393 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1394
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1395
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1396 virtual void SetProtectedPatient(int64_t internalId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1397 bool isProtected) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1398 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1399 if (isProtected)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1400 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1401 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM PatientRecyclingOrder WHERE patientId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1402 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1403 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1404 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1405 else if (IsProtectedPatient(internalId))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1406 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1407 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO PatientRecyclingOrder (seq, patientId) VALUES(NULL, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1408 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1409 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1410 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1411 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1412 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1413 // Nothing to do: The patient is already unprotected
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1414 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1415 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1416
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1417
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1418 // From the "ISetResourcesContent" interface
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1419 virtual void SetMainDicomTag(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1420 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1421 const std::string& value) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1422 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1423 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags (id, tagGroup, tagElement, value) VALUES(?, ?, ?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1424 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1425 s.BindInt(1, tag.GetGroup());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1426 s.BindInt(2, tag.GetElement());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1427 s.BindString(3, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1428 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1429 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1430
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1431
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1432 virtual void SetMetadata(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1433 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1434 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1435 int64_t revision) ORTHANC_OVERRIDE
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1436 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1437 // TODO - REVISIONS
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1438 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR REPLACE INTO Metadata (id, type, value) VALUES(?, ?, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1439 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1440 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1441 s.BindString(2, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1442 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1443 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1444
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1445
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1446 virtual void SetResourcesContent(const Orthanc::ResourcesContent& content) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1447 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1448 ISetResourcesContent::Apply(*this, content);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1449 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1450
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1451
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1452 // From the "ICreateInstance" interface
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1453 virtual void TagMostRecentPatient(int64_t patient) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1454 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1455 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1456 SQLite::Statement s(db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1457 "DELETE FROM PatientRecyclingOrder WHERE patientId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1458 s.BindInt64(0, patient);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1459 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1460
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1461 assert(db_.GetLastChangeCount() == 0 \|\|
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1462 db_.GetLastChangeCount() == 1);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1463
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1464 if (db_.GetLastChangeCount() == 0)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1465 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1466 // The patient was protected, there was nothing to delete from the recycling order
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1467 return;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1468 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1469 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1470
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1471 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1472 SQLite::Statement s(db_, SQLITE_FROM_HERE,
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1473 "INSERT INTO PatientRecyclingOrder (seq, patientId) VALUES(NULL, ?)");
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1474 s.BindInt64(0, patient);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1475 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1476 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1477 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1478
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1479
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1480 virtual void AddLabel(int64_t resource,
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1481 const std::string& label) ORTHANC_OVERRIDE
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1482 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1483 if (label.empty())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1484 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1485 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1486 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1487 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1488 {
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1489 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR IGNORE INTO Labels (id, label) VALUES(?, ?)");
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1490 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1491 s.BindString(1, label);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1492 s.Run();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1493 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1494 }
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1495
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1496
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1497 virtual void RemoveLabel(int64_t resource,
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1498 const std::string& label) ORTHANC_OVERRIDE
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1499 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1500 if (label.empty())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1501 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1502 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1503 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1504 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1505 {
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1506 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Labels WHERE id=? AND label=?");
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1507 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1508 s.BindString(1, label);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1509 s.Run();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1510 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1511 }
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1512
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1513
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1514 virtual void ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1515 int64_t resource) ORTHANC_OVERRIDE
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1516 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1517 target.clear();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1518
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1519 SQLite::Statement s(db_, SQLITE_FROM_HERE,
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1520 "SELECT label FROM Labels WHERE id=?");
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1521 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1522
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1523 while (s.Step())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1524 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1525 target.insert(s.ColumnString(0));
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1526 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1527 }
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	1528
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	1529
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	1530 virtual void ListAllLabels(std::set<std::string>& target) 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	1531 {
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	1532 target.clear();
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	1533
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	1534 SQLite::Statement s(db_, SQLITE_FROM_HERE,
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	1535 "SELECT DISTINCT label FROM Labels");
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	1536
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	1537 while (s.Step())
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	1538 {
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	1539 target.insert(s.ColumnString(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	1540 }
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	1541 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1542 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1543
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1544
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1545 class SQLiteDatabaseWrapper::SignalFileDeleted : public SQLite::IScalarFunction
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1546 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1547 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1548 SQLiteDatabaseWrapper& sqlite_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1549
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1550 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1551 SignalFileDeleted(SQLiteDatabaseWrapper& sqlite) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1552 sqlite_(sqlite)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1553 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1554 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1555
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1556 virtual const char* GetName() const ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1557 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1558 return "SignalFileDeleted";
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1559 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1560
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1561 virtual unsigned int GetCardinality() const ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1562 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1563 return 7;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1564 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1565
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1566 virtual void Compute(SQLite::FunctionContext& context) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1567 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1568 if (sqlite_.activeTransaction_ != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1569 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1570 std::string uncompressedMD5, compressedMD5;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1571
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1572 if (!context.IsNullValue(5))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1573 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1574 uncompressedMD5 = context.GetStringValue(5);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1575 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1576
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1577 if (!context.IsNullValue(6))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1578 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1579 compressedMD5 = context.GetStringValue(6);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1580 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1581
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1582 FileInfo info(context.GetStringValue(0),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1583 static_cast<FileContentType>(context.GetIntValue(1)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1584 static_cast<uint64_t>(context.GetInt64Value(2)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1585 uncompressedMD5,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1586 static_cast<CompressionType>(context.GetIntValue(3)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1587 static_cast<uint64_t>(context.GetInt64Value(4)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1588 compressedMD5);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1589
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1590 sqlite_.activeTransaction_->GetListener().SignalAttachmentDeleted(info);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1591 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1592 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1593 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1594
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1595
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1596 class SQLiteDatabaseWrapper::SignalResourceDeleted : public SQLite::IScalarFunction
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1597 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1598 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1599 SQLiteDatabaseWrapper& sqlite_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1600
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1601 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1602 SignalResourceDeleted(SQLiteDatabaseWrapper& sqlite) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1603 sqlite_(sqlite)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1604 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1605 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1606
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1607 virtual const char* GetName() const ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1608 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1609 return "SignalResourceDeleted";
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1610 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1611
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1612 virtual unsigned int GetCardinality() const ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1613 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1614 return 2;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1615 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1616
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1617 virtual void Compute(SQLite::FunctionContext& context) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1618 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1619 if (sqlite_.activeTransaction_ != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1620 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1621 sqlite_.activeTransaction_->GetListener().
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1622 SignalResourceDeleted(static_cast<ResourceType>(context.GetIntValue(1)),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1623 context.GetStringValue(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1624 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1625 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1626 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1627
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1628
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1629 class SQLiteDatabaseWrapper::ReadWriteTransaction : public SQLiteDatabaseWrapper::TransactionBase
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1630 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1631 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1632 SQLiteDatabaseWrapper& that_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1633 std::unique_ptr<SQLite::Transaction> transaction_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1634 int64_t initialDiskSize_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1635
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1636 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1637 ReadWriteTransaction(SQLiteDatabaseWrapper& that,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1638 IDatabaseListener& listener) :
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	1639 TransactionBase(that.mutex_, that.db_, listener, *that.signalRemainingAncestor_),
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1640 that_(that),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1641 transaction_(new SQLite::Transaction(that_.db_))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1642 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1643 if (that_.activeTransaction_ != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1644 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1645 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1646 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1647
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1648 that_.activeTransaction_ = this;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1649
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1650 #if defined(NDEBUG)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1651 // Release mode
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1652 initialDiskSize_ = 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1653 #else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1654 // Debug mode
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1655 initialDiskSize_ = static_cast<int64_t>(GetTotalCompressedSize());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1656 #endif
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1657 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1658
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1659 virtual ~ReadWriteTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1660 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1661 assert(that_.activeTransaction_ != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1662 that_.activeTransaction_ = NULL;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1663 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1664
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1665 void Begin()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1666 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1667 transaction_->Begin();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1668 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1669
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1670 virtual void Rollback() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1671 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1672 transaction_->Rollback();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1673 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1674
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1675 virtual void Commit(int64_t fileSizeDelta /* only used in debug */) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1676 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1677 transaction_->Commit();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1678
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1679 assert(initialDiskSize_ + fileSizeDelta >= 0 &&
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1680 initialDiskSize_ + fileSizeDelta == static_cast<int64_t>(GetTotalCompressedSize()));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1681 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1682 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1683
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1684
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1685 class SQLiteDatabaseWrapper::ReadOnlyTransaction : public SQLiteDatabaseWrapper::TransactionBase
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1686 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1687 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1688 SQLiteDatabaseWrapper& that_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1689
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1690 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1691 ReadOnlyTransaction(SQLiteDatabaseWrapper& that,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1692 IDatabaseListener& listener) :
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	1693 TransactionBase(that.mutex_, that.db_, listener, *that.signalRemainingAncestor_),
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1694 that_(that)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1695 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1696 if (that_.activeTransaction_ != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1697 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1698 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1699 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1700
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1701 that_.activeTransaction_ = this;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1702 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1703
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1704 virtual ~ReadOnlyTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1705 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1706 assert(that_.activeTransaction_ != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1707 that_.activeTransaction_ = NULL;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1708 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1709
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1710 virtual void Rollback() ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1711 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1712 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1713
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1714 virtual void Commit(int64_t fileSizeDelta /* only used in debug */) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1715 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1716 if (fileSizeDelta != 0)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1717 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1718 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1719 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1720 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1721 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1722
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1723
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1724 SQLiteDatabaseWrapper::SQLiteDatabaseWrapper(const std::string& path) :
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1725 activeTransaction_(NULL),
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1729 diff changeset	1726 signalRemainingAncestor_(NULL),
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1727 version_(0)
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1728 {
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1729 // TODO: implement revisions in SQLite
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1730 dbCapabilities_.SetFlushToDisk(true);
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1731 dbCapabilities_.SetLabelsSupport(true);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1732 dbCapabilities_.SetHasExtendedChanges(true);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1733 db_.Open(path);
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1734 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1735
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1736
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1737 SQLiteDatabaseWrapper::SQLiteDatabaseWrapper() :
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1738 activeTransaction_(NULL),
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1729 diff changeset	1739 signalRemainingAncestor_(NULL),
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1740 version_(0)
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1741 {
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1742 // TODO: implement revisions in SQLite
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1743 dbCapabilities_.SetFlushToDisk(true);
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1744 dbCapabilities_.SetLabelsSupport(true);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1745 dbCapabilities_.SetHasExtendedChanges(true);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1746 db_.OpenInMemory();
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1747 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1748
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1749 SQLiteDatabaseWrapper::~SQLiteDatabaseWrapper()
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1750 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1751 if (activeTransaction_ != NULL)
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1752 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1753 LOG(ERROR) << "A SQLite transaction is still active in the SQLiteDatabaseWrapper destructor: Expect a crash";
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1754 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1755 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1756
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1757
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1758 void SQLiteDatabaseWrapper::Open()
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1759 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1760 {
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1761 boost::mutex::scoped_lock lock(mutex_);
1717 3926e6317a43 SetIdentifierTagInternal Sebastien Jodogne <s.jodogne@gmail.com> parents: 1712 diff changeset	1762
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1763 if (signalRemainingAncestor_ != NULL)
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1764 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1765 throw OrthancException(ErrorCode_BadSequenceOfCalls); // Cannot open twice
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1766 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1767
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1768 signalRemainingAncestor_ = dynamic_cast<SignalRemainingAncestor*>(db_.Register(new SignalRemainingAncestor));
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1769 db_.Register(new SignalFileDeleted(*this));
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1770 db_.Register(new SignalResourceDeleted(*this));
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1771
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1772 db_.Execute("PRAGMA ENCODING=\"UTF-8\";");
374 42e87c17cab8 some refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1773
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1774 // Performance tuning of SQLite with PRAGMAs
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1775 // http://www.sqlite.org/pragma.html
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1776 db_.Execute("PRAGMA SYNCHRONOUS=NORMAL;");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1777 db_.Execute("PRAGMA JOURNAL_MODE=WAL;");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1778 db_.Execute("PRAGMA LOCKING_MODE=EXCLUSIVE;");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1779 db_.Execute("PRAGMA WAL_AUTOCHECKPOINT=1000;");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1780 //db_.Execute("PRAGMA TEMP_STORE=memory");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1781
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1782 // Make "LIKE" case-sensitive in SQLite
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1783 db_.Execute("PRAGMA case_sensitive_like = true;");
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1784 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1785
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1786 VoidDatabaseListener listener;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1787
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1788 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1789 std::unique_ptr<ITransaction> transaction(StartTransaction(TransactionType_ReadOnly, listener));
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	1790
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1791 if (!db_.DoesTableExist("GlobalProperties"))
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	1792 {
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1793 LOG(INFO) << "Creating the database";
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	1794 std::string query;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1795 ServerResources::GetFileResource(query, ServerResources::PREPARE_DATABASE);
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	1796 db_.Execute(query);
e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	1797 }
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1798
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1799 // Check the version of the database
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1800 std::string tmp;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1801 if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion, true /* unused in SQLite */))
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1802 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1803 tmp = "Unknown";
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1804 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1805
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1806 bool ok = false;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1807 try
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1808 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1809 LOG(INFO) << "Version of the Orthanc database: " << tmp;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1810 version_ = boost::lexical_cast<unsigned int>(tmp);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1811 ok = true;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1812 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1813 catch (boost::bad_lexical_cast&)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1814 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1815 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1816
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1817 if (!ok)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1818 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1819 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion,
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1820 "Incompatible version of the Orthanc database: " + tmp);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1821 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1822
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1823 if (version_ == 6)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1824 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1825 // New in Orthanc 1.5.1
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1826 if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast, true /* unused in SQLite */) \|\|
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1827 tmp != "1")
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1828 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1829 LOG(INFO) << "Installing the SQLite triggers to track the size of the attachments";
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1830 std::string query;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1831 ServerResources::GetFileResource(query, ServerResources::INSTALL_TRACK_ATTACHMENTS_SIZE);
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1832 db_.Execute(query);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1833 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1834
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1835 // New in Orthanc 1.12.0
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1836 if (!db_.DoesTableExist("Labels"))
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1837 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1838 LOG(INFO) << "Installing the \"Labels\" table";
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1839 std::string query;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1840 ServerResources::GetFileResource(query, ServerResources::INSTALL_LABELS_TABLE);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1841 db_.Execute(query);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1842 }
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1843 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1844
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1845 transaction->Commit(0);
3018 e3b5c07146a3 speeding up the computation of the size of the attachments in SQLite Sebastien Jodogne <s.jodogne@gmail.com> parents: 3017 diff changeset	1846 }
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1847 }
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1848
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1849
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1850 void SQLiteDatabaseWrapper::Close()
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1851 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1852 boost::mutex::scoped_lock lock(mutex_);
5057 e6f26be401fa SQLite: close and delete WAL and SHM files on exit (contribution from Sebastian Höffner) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1853 // close and delete the WAL when exiting properly -> the DB is stored in a single file (no more -wal and -shm files)
e6f26be401fa SQLite: close and delete WAL and SHM files on exit (contribution from Sebastian Höffner) Alain Mazy <am@osimis.io> parents: 4892 diff changeset	1854 db_.Execute("PRAGMA JOURNAL_MODE=DELETE;");
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1855 db_.Close();
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1856 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1857
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1858
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1859 static void ExecuteUpgradeScript(SQLite::Connection& db,
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1860 ServerResources::FileResourceId script)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1861 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1862 std::string upgrade;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1863 ServerResources::GetFileResource(upgrade, script);
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1864 db.BeginTransaction();
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1865 db.Execute(upgrade);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1866 db.CommitTransaction();
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1867 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1868
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1869
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1870 void SQLiteDatabaseWrapper::Upgrade(unsigned int targetVersion,
517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1871 IStorageArea& storageArea)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1872 {
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1873 boost::mutex::scoped_lock lock(mutex_);
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1874
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1875 if (targetVersion != 6)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1876 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1877 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1878 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1879
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1880 // This version of Orthanc is only compatible with versions 3, 4,
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1881 // 5 and 6 of the DB schema
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1882 if (version_ != 3 &&
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1883 version_ != 4 &&
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1884 version_ != 5 &&
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1885 version_ != 6)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1886 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1887 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1888 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1889
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1890 if (version_ == 3)
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1891 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1892 LOG(WARNING) << "Upgrading database version from 3 to 4";
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1893 ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_3_TO_4);
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1894 version_ = 4;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1895 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1896
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1897 if (version_ == 4)
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1898 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1899 LOG(WARNING) << "Upgrading database version from 4 to 5";
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1900 ExecuteUpgradeScript(db_, ServerResources::UPGRADE_DATABASE_4_TO_5);
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1901 version_ = 5;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1902 }
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1903
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1904 if (version_ == 5)
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1905 {
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1906 LOG(WARNING) << "Upgrading database version from 5 to 6";
1668 de1413733c97 reconstructing main dicom tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 1665 diff changeset	1907 // No change in the DB schema, the step from version 5 to 6 only
1710 d72cf0c11f42 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1908 // consists in reconstructing the main DICOM tags information
d72cf0c11f42 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1909 // (as more tags got included).
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1910
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1911 VoidDatabaseListener listener;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1912
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1913 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1914 std::unique_ptr<ITransaction> transaction(StartTransaction(TransactionType_ReadWrite, listener));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1915 ServerToolbox::ReconstructMainDicomTags(*transaction, storageArea, ResourceType_Patient);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1916 ServerToolbox::ReconstructMainDicomTags(*transaction, storageArea, ResourceType_Study);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1917 ServerToolbox::ReconstructMainDicomTags(*transaction, storageArea, ResourceType_Series);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1918 ServerToolbox::ReconstructMainDicomTags(*transaction, storageArea, ResourceType_Instance);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1919 db_.Execute("UPDATE GlobalProperties SET value=\"6\" WHERE property=" +
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1920 boost::lexical_cast<std::string>(GlobalProperty_DatabaseSchemaVersion) + ";");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1921 transaction->Commit(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1922 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1923
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1924 version_ = 6;
1729 54d78925cbb6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	1925 }
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1926 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1927
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1928
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	1929 IDatabaseWrapper::ITransaction* SQLiteDatabaseWrapper::StartTransaction(TransactionType type,
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	1930 IDatabaseListener& listener)
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1931 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1932 switch (type)
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1933 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1934 case TransactionType_ReadOnly:
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	1935 return new ReadOnlyTransaction(*this, listener); // This is a no-op transaction in SQLite (thanks to mutex)
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1936
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1937 case TransactionType_ReadWrite:
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1938 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1939 std::unique_ptr<ReadWriteTransaction> transaction;
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	1940 transaction.reset(new ReadWriteTransaction(*this, listener));
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1941 transaction->Begin();
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1942 return transaction.release();
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1943 }
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1944
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1945 default:
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1946 throw OrthancException(ErrorCode_InternalError);
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	1947 }
3019 8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3018 diff changeset	1948 }
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3018 diff changeset	1949
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1950
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1951 void SQLiteDatabaseWrapper::FlushToDisk()
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1952 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1953 boost::mutex::scoped_lock lock(mutex_);
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1954 db_.FlushToDisk();
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1955 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1956
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1957
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1958 int64_t SQLiteDatabaseWrapper::UnitTestsTransaction::CreateResource(const std::string& publicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1959 ResourceType type)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1960 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1961 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Resources (internalId, resourceType, publicId, parentId) VALUES(NULL, ?, ?, NULL)");
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1962 s.BindInt(0, type);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1963 s.BindString(1, publicId);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1964 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1965 return db_.GetLastInsertRowId();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1966 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1967
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1968
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1969 void SQLiteDatabaseWrapper::UnitTestsTransaction::AttachChild(int64_t parent,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1970 int64_t child)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1971 {
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1972 SQLite::Statement s(db_, SQLITE_FROM_HERE, "UPDATE Resources SET parentId = ? WHERE internalId = ?");
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1973 s.BindInt64(0, parent);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1974 s.BindInt64(1, child);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1975 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1976 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1977
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1978
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1979 void SQLiteDatabaseWrapper::UnitTestsTransaction::SetIdentifierTag(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1980 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1981 const std::string& value)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1982 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1983 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO DicomIdentifiers (id, tagGroup, tagElement, value) VALUES(?, ?, ?, ?)");
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1984 s.BindInt64(0, id);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1985 s.BindInt(1, tag.GetGroup());
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1986 s.BindInt(2, tag.GetElement());
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1987 s.BindString(3, value);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1988 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1989 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1990
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1991
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1992 void SQLiteDatabaseWrapper::UnitTestsTransaction::SetMainDicomTag(int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1993 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1994 const std::string& value)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1995 {
5090 cc1a8b3ff319 Made the default SQLite DB more robust wrt future updates like adding new columns in DB. Alain Mazy <am@osimis.io> parents: 5057 diff changeset	1996 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags (id, tagGroup, tagElement, value) VALUES(?, ?, ?, ?)");
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1997 s.BindInt64(0, id);
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1998 s.BindInt(1, tag.GetGroup());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1999 s.BindInt(2, tag.GetElement());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2000 s.BindString(3, value);
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2001 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2002 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2003
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2004
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2005 int64_t SQLiteDatabaseWrapper::UnitTestsTransaction::GetTableRecordCount(const std::string& table)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2006 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2007 /**
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2008 * "Generally one cannot use SQL parameters/placeholders for
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2009 * database identifiers (tables, columns, views, schemas, etc.) or
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2010 * database functions (e.g., CURRENT_DATE), but instead only for
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2011 * binding literal values." => To avoid any SQL injection, we
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2012 * check that the "table" parameter has only alphabetic
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2013 * characters.
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2014 * https://stackoverflow.com/a/1274764/881731
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2015 **/
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2016 for (size_t i = 0; i < table.size(); i++)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2017 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2018 if (!isalpha(table[i]))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2019 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2020 throw OrthancException(ErrorCode_ParameterOutOfRange);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2021 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2022 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2023
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2024 // Don't use "SQLITE_FROM_HERE", otherwise "table" would be cached
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2025 SQLite::Statement s(db_, "SELECT COUNT(*) FROM " + table);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2026
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2027 if (s.Step())
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2028 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2029 int64_t c = s.ColumnInt(0);
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2030 assert(!s.Step());
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2031 return c;
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2032 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2033 else
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2034 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2035 throw OrthancException(ErrorCode_InternalError);
3105 2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2036 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2037 }
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2038
f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2039
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2040 bool SQLiteDatabaseWrapper::UnitTestsTransaction::GetParentPublicId(std::string& target,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2041 int64_t id)
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2042 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2043 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2044 "WHERE a.internalId = b.parentId AND b.internalId = ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2045 s.BindInt64(0, id);
3124 c0d7aee8c3f8 Fix issue #58 (Patient recycling order should be defined by their received last instance) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	2046
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2047 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2048 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2049 target = s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2050 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2051 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2052 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2053 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2054 return false;
3124 c0d7aee8c3f8 Fix issue #58 (Patient recycling order should be defined by their received last instance) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	2055 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2056 }
3124 c0d7aee8c3f8 Fix issue #58 (Patient recycling order should be defined by their received last instance) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	2057
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2058
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2059 void SQLiteDatabaseWrapper::UnitTestsTransaction::GetChildren(std::list<std::string>& childrenPublicIds,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2060 int64_t id)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2061 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2062 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE parentId=?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2063 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2064
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2065 childrenPublicIds.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2066 while (s.Step())
3124 c0d7aee8c3f8 Fix issue #58 (Patient recycling order should be defined by their received last instance) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	2067 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2068 childrenPublicIds.push_back(s.ColumnString(0));
3124 c0d7aee8c3f8 Fix issue #58 (Patient recycling order should be defined by their received last instance) Sebastien Jodogne <s.jodogne@gmail.com> parents: 3121 diff changeset	2069 }
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2070 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2071 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5758:ca06dde85358 large-queries