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

annotate OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5782:f1ccb67fce31 find-refactoring

fix

author	Alain Mazy <am@orthanc.team>
date	Sat, 14 Sep 2024 11:24:11 +0200
parents	de33982a0bf4
children	a3d283f61304

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
5762 d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	68 virtual std::string FormatLimits(uint64_t since, uint64_t count) ORTHANC_OVERRIDE
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	69 {
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	70 std::string sql;
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	71
5762 d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	72 if (count > 0)
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	73 {
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	74 sql += " LIMIT " + boost::lexical_cast<std::string>(count);
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	75 }
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	76
5762 d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	77 if (since > 0)
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	78 {
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	79 if (count == 0)
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	80 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	81 sql += " LIMIT -1"; // In SQLite, "OFFSET" cannot appear without "LIMIT"
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	82 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	83
5762 d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	84 sql += " OFFSET " + boost::lexical_cast<std::string>(since);
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	85 }
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	86
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	87 return sql;
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	88 }
d52b3f394f69 FormatLimits (SQLServer needs custom code) Alain Mazy <am@orthanc.team> parents: 5758 diff changeset	89
4817 b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	90 virtual bool IsEscapeBrackets() const ORTHANC_OVERRIDE
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	91 {
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	92 return false;
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	93 }
b8fcd331b4b3 added ISqlLookupFormatter::IsEscapeBrackets() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4627 diff changeset	94
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	95 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	96 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	97 size_t pos = 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	98
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	99 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	100 it = values_.begin(); it != values_.end(); ++it, pos++)
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	101 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	102 statement.BindString(pos, *it);
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	103 }
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	104 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	105 };
1158 badc14fee61f speed up db Sebastien Jodogne <s.jodogne@gmail.com> parents: 1006 diff changeset	106
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	107
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	108 class SQLiteDatabaseWrapper::SignalRemainingAncestor : public SQLite::IScalarFunction
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	109 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	110 private:
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	111 bool hasRemainingAncestor_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	112 std::string remainingPublicId_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	113 ResourceType remainingType_;
660 f0232774b913 fix warnings Sebastien Jodogne <s.jodogne@gmail.com> parents: 616 diff changeset	114
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	115 public:
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	116 SignalRemainingAncestor() :
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	117 hasRemainingAncestor_(false)
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	118 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	119 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	120
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	121 void Reset()
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_ = false;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	124 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	125
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	126 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	127 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	128 return "SignalRemainingAncestor";
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	129 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	130
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	131 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	132 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	133 return 2;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	134 }
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 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	137 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	138 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	139 << context.GetStringValue(0) << "\" of type "
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	140 << context.GetIntValue(1);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	141
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	142 if (!hasRemainingAncestor_ \|\|
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	143 remainingType_ >= context.GetIntValue(1))
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 hasRemainingAncestor_ = true;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	146 remainingPublicId_ = context.GetStringValue(0);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	147 remainingType_ = static_cast<ResourceType>(context.GetIntValue(1));
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	148 }
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	149 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	150
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	151 bool HasRemainingAncestor() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	152 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	153 return hasRemainingAncestor_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	154 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	155
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	156 const std::string& GetRemainingAncestorId() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	157 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	158 assert(hasRemainingAncestor_);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	159 return remainingPublicId_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	160 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	161
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	162 ResourceType GetRemainingAncestorType() const
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	163 {
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	164 assert(hasRemainingAncestor_);
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	165 return remainingType_;
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	166 }
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	167 };
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	168
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	169
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	170 class SQLiteDatabaseWrapper::TransactionBase :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	171 public SQLiteDatabaseWrapper::UnitTestsTransaction,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	172 public Compatibility::ICreateInstance,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	173 public Compatibility::IGetChildrenMetadata,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	174 public Compatibility::ILookupResourceAndParent,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	175 public Compatibility::ISetResourcesContent
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	176 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	177 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	178 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	179 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	180 ResourceType level)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	181 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	182 resourcesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	183 instancesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	184
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	185 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	186
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	187 switch (level)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	188 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	189 case ResourceType_Patient:
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 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	192 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	193 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	194 "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	195 "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	196 "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	197 "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	198 "GROUP BY patients.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	199
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	200 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	201 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	202
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	203 case ResourceType_Study:
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 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	206 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	207 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	208 "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	209 "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	210 "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	211 "GROUP BY studies.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	212
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	213 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	214 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	215
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	216 case ResourceType_Series:
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 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	219 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	220 db_, SQLITE_FROM_HERE,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	221 "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	222 "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	223 "GROUP BY series.publicId"));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	224
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	225 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	226 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	227
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	228 case ResourceType_Instance:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	229 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	230 statement.reset(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	231 new SQLite::Statement(
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	232 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	233
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	234 break;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	235 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	236
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	237 default:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	238 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	239 }
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 assert(statement.get() != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	242
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	243 while (statement->Step())
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 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	246 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	247 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	248 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	249
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	250
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	251 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	252 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	253 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	254 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	255
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	256
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	257 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	258 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	259 SQLite::Statement& s,
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	260 uint32_t limit,
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	261 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	262 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	263 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	264
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	265 while (s.Step())
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	266 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	267 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	268 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	269 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	270 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	271
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	272 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	273 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	274
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	275 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	276 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	277
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	278 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	279
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	280 // if we have retrieved more changes than requested -> cleanup
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	281 if (target.size() > limit)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	282 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	283 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	284
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	285 if (returnFirstResults)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	286 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	287 target.pop_back();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	288 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	289 else
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	290 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	291 target.pop_front();
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	292 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	293 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	294 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	295
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	296
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	297 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	298 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	299 SQLite::Statement& s,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	300 uint32_t limit)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	301 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	302 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	303
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	304 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	305 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	306 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	307 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	308 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	309
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	310 ExportedResource resource(seq,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	311 resourceType,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	312 publicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	313 s.ColumnString(3), // modality
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	314 s.ColumnString(8), // date
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	315 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	316 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	317 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	318 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	319
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	320 target.push_back(resource);
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
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	323 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	324 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	325
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	326
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	327 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	328 int64_t id)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	329 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	330 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	331 s.BindInt64(0, id);
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 childrenPublicIds.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	334 while (s.Step())
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 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	337 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	338 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	339
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	340 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	341 IDatabaseListener& listener_;
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	342 SignalRemainingAncestor& signalRemainingAncestor_;
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	343
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	344 public:
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	345 TransactionBase(boost::mutex& mutex,
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	346 SQLite::Connection& db,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	347 IDatabaseListener& listener,
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	348 SignalRemainingAncestor& signalRemainingAncestor) :
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	349 UnitTestsTransaction(db),
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	350 lock_(mutex),
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	351 listener_(listener),
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	352 signalRemainingAncestor_(signalRemainingAncestor)
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	353 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	354 }
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 IDatabaseListener& GetListener() const
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 return listener_;
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	359 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	360
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	361
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	362 virtual void AddAttachment(int64_t id,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	363 const FileInfo& attachment,
f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	364 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	365 {
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	366 // 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	367 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	368 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	369 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	370 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	371 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	372 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	373 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	374 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	375 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	376 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	380 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	381 std::list<std::string>* instancesId,
5680 68fc5af30c03 added container class DatabaseConstraints Sebastien Jodogne <s.jodogne@gmail.com> parents: 5640 diff changeset	382 const DatabaseConstraints& lookup,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	383 ResourceType queryLevel,
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	384 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	385 LabelsConstraint labelsConstraint,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	386 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	387 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	388 LookupFormatter formatter;
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 std::string sql;
5248 a7d95f951f8a replaced "WithLabels" and "WithoutLabels", by "Labels" and "LabelsConstraint" Sebastien Jodogne <s.jodogne@gmail.com> parents: 5227 diff changeset	391 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	392
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	393 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	394
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 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	397 s.Run();
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 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	401 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	402 formatter.Bind(statement);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	403 statement.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	404 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	405
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	406 if (instancesId != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	407 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	408 AnswerLookup(resourcesId, *instancesId, queryLevel);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	409 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	410 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	411 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	412 resourcesId.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	413
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	414 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	415
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	416 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	417 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	418 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	419 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	420 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	421 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	422
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	423 virtual void ExecuteFind(FindResponse& response,
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	424 const FindRequest& request,
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	425 const Capabilities& capabilities) ORTHANC_OVERRIDE
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	426 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	427 const ResourceType requestLevel = request.GetLevel();
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	428 std::string sql;
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 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	431 // clean previous lookup table
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	432 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	433 s.Run();
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
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	436 {
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	437 // 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	438 LookupFormatter formatter;
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	439 LookupFormatter::Apply(sql, formatter, request);
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	440
5782 f1ccb67fce31 fix Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	441 sql = "CREATE TEMPORARY TABLE Lookup AS " + sql; // TODO-FIND: use a CTE
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	442
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	443 SQLite::Statement statement(db_, sql);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	444 formatter.Bind(statement);
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	445 statement.Run();
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	446
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	447 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	448 while (s.Step())
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 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	451 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	452 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	453
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	454 // need MainDicomTags from resource ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	455 if (request.IsRetrieveMainDicomTags())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	456 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	457 sql = "SELECT id, tagGroup, tagElement, value "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	458 "FROM MainDicomTags "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	459 "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	460
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	461 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	462 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	463 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	464 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	465 res.AddStringDicomTag(requestLevel,
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	466 static_cast<uint16_t>(s.ColumnInt(1)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	467 static_cast<uint16_t>(s.ColumnInt(2)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	468 s.ColumnString(3));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	469 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	470 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	471
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	472 // need MainDicomTags from parent ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	473 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	474 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	475 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	476 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	477 "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	478 "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	479
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	480 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	481 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	482 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	483 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	484 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	485 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	486 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	487 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	488 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	489 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	490
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	491 // need MainDicomTags from grandparent ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	492 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	493 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	494 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	495 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	496 "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	497 "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	498 "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	499
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	500 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	501 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	502 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	503 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	504 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	505 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	506 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	507 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	508 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	509 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	510
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	511 // need MainDicomTags from children ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	512 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	513 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	514 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	515 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	516 "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	517 "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	518
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	519 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	520 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	521 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	522 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	523 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	524 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	525 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	526 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	527 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	528 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	529
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	530 // need MainDicomTags from grandchildren ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	531 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	532 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	533 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	534 "FROM MainDicomTags "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	535 "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	536 "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	537 "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	538
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	539 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	540 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	541 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	542 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	543 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	544 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	545 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	546 s.ColumnString(3));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	547 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	548 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	549
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	550 // need parent identifier ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	551 if (request.IsRetrieveParentIdentifier())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	552 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	553 sql = "SELECT currentLevel.internalId, parentLevel.publicId "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	554 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	555 "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	556 "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	557
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	558 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	559 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	560 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	561 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	562 res.SetParentIdentifier(s.ColumnString(1));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	563 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	564 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	565
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	566 // need resource metadata ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	567 if (request.IsRetrieveMetadata())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	568 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	569 sql = "SELECT id, type, value "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	570 "FROM Metadata "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	571 "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	572
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	573 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	574 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	575 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	576 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	577 res.AddMetadata(requestLevel,
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	578 static_cast<MetadataType>(s.ColumnInt(1)),
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	579 s.ColumnString(2));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	580 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	581 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	582
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	583 // need resource labels ?
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	584 if (request.IsRetrieveLabels())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	585 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	586 sql = "SELECT Lookup.internalId, label "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	587 "FROM Labels "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	588 "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	589
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	590 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	591 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	592 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	593 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	594 res.AddLabel(s.ColumnString(1));
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	595 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	596 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	597
5782 f1ccb67fce31 fix Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	598 // need one instance info ?
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	599 if (request.GetLevel() != ResourceType_Instance &&
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	600 request.IsRetrieveOneInstanceMetadataAndAttachments())
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	601 {
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	602 {
5782 f1ccb67fce31 fix Alain Mazy <am@orthanc.team> parents: 5776 diff changeset	603 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DROP TABLE IF EXISTS OneInstance"); // TODO-FIND: use a CTE
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	604 s.Run();
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	605 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	606
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	607 switch (requestLevel)
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	608 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	609 case ResourceType_Patient:
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	610 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	611 SQLite::Statement s(
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	612 db_, SQLITE_FROM_HERE,
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	613 "CREATE TEMPORARY TABLE OneInstance AS "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	614 "SELECT Lookup.internalId AS parentInternalId, grandGrandChildLevel.publicId AS instancePublicId, grandGrandChildLevel.internalId AS instanceInternalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	615 "FROM Resources AS grandGrandChildLevel "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	616 "INNER JOIN Resources grandChildLevel ON grandGrandChildLevel.parentId = grandChildLevel.internalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	617 "INNER JOIN Resources childLevel ON grandChildLevel.parentId = childLevel.internalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	618 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId GROUP BY Lookup.internalId");
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	619 s.Run();
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	620 break;
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	621 }
5772 093a8693ba16 replaced SetRetrieveOneInstanceIdentifier() by SetRetrieveOneInstanceMetadataAndAttachments() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5762 diff changeset	622
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	623 case ResourceType_Study:
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	624 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	625 SQLite::Statement s(
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	626 db_, SQLITE_FROM_HERE,
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	627 "CREATE TEMPORARY TABLE OneInstance AS "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	628 "SELECT Lookup.internalId AS parentInternalId, grandChildLevel.publicId AS instancePublicId, grandChildLevel.internalId AS instanceInternalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	629 "FROM Resources AS grandChildLevel "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	630 "INNER JOIN Resources childLevel ON grandChildLevel.parentId = childLevel.internalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	631 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId GROUP BY Lookup.internalId");
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	632 s.Run();
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	633 break;
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	634 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	635
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	636 case ResourceType_Series:
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	637 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	638 SQLite::Statement s(
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	639 db_, SQLITE_FROM_HERE,
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	640 "CREATE TEMPORARY TABLE OneInstance AS "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	641 "SELECT Lookup.internalId AS parentInternalId, childLevel.publicId AS instancePublicId, childLevel.internalId AS instanceInternalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	642 "FROM Resources AS childLevel "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	643 "INNER JOIN Lookup ON childLevel.parentId = Lookup.internalId GROUP BY Lookup.internalId");
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	644 s.Run();
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	645 break;
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	646 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	647
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	648 default:
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	649 throw OrthancException(ErrorCode_InternalError);
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	650 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	651
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	652 {
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	653 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT parentInternalId, instancePublicId FROM OneInstance");
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	654 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	655 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	656 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	657 res.SetOneInstancePublicId(s.ColumnString(1));
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	658 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	659 }
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	660
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	661 {
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	662 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT OneInstance.parentInternalId, Metadata.type, Metadata.value "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	663 "FROM Metadata INNER JOIN OneInstance ON Metadata.id = OneInstance.instanceInternalId");
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	664 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	665 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	666 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	667 res.AddOneInstanceMetadata(static_cast<MetadataType>(s.ColumnInt(1)), s.ColumnString(2));
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	668 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	669 }
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	670
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	671 {
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	672 SQLite::Statement s(db_, SQLITE_FROM_HERE,
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	673 "SELECT OneInstance.parentInternalId, AttachedFiles.fileType, AttachedFiles.uuid, "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	674 "AttachedFiles.uncompressedSize, AttachedFiles.compressedSize, "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	675 "AttachedFiles.compressionType, AttachedFiles.uncompressedMD5, AttachedFiles.compressedMD5 "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	676 "FROM AttachedFiles INNER JOIN OneInstance ON AttachedFiles.id = OneInstance.instanceInternalId");
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	677 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	678 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	679 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	680 res.AddOneInstanceAttachment(
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	681 FileInfo(s.ColumnString(2), static_cast<FileContentType>(s.ColumnInt(1)),
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	682 s.ColumnInt64(3), s.ColumnString(6),
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	683 static_cast<CompressionType>(s.ColumnInt(5)),
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	684 s.ColumnInt64(4), s.ColumnString(7)));
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	685 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	686 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	687 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	688
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	689 // need children metadata ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	690 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	691 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	692 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	693 "FROM Metadata "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	694 "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	695 "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	696
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	697 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	698 while (s.Step())
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	699 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	700 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	701 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	702 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	703 s.ColumnString(2));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	704 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	705 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	706
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	707 // need grandchildren metadata ?
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	708 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	709 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	710 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	711 "FROM Metadata "
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	712 "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	713 "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	714 "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	715
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	716 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	717 while (s.Step())
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	718 {
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	719 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	720 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	721 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	722 s.ColumnString(2));
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	723 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	724 }
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	725
5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	726 // need children identifiers ?
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	727 if ((requestLevel == ResourceType_Patient && request.GetChildrenSpecification(ResourceType_Study).IsRetrieveIdentifiers()) \|\|
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	728 (requestLevel == ResourceType_Study && request.GetChildrenSpecification(ResourceType_Series).IsRetrieveIdentifiers()) \|\|
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	729 (requestLevel == ResourceType_Series && request.GetChildrenSpecification(ResourceType_Instance).IsRetrieveIdentifiers()))
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	730 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	731 sql = "SELECT Lookup.internalId, childLevel.publicId "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	732 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	733 "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	734 "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	735
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	736 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	737 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	738 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	739 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	740 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	741 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	742 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	743
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	744 // need grandchildren identifiers ?
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	745 if ((requestLevel == ResourceType_Patient && request.GetChildrenSpecification(ResourceType_Series).IsRetrieveIdentifiers()) \|\|
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	746 (requestLevel == ResourceType_Study && request.GetChildrenSpecification(ResourceType_Instance).IsRetrieveIdentifiers()))
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	747 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	748 sql = "SELECT Lookup.internalId, grandChildLevel.publicId "
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	749 "FROM Resources AS currentLevel "
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	750 "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	751 "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	752 "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	753
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	754 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	755 while (s.Step())
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	756 {
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	757 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	758 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	759 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	760 }
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	761
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	762 // need grandgrandchildren identifiers ?
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	763 if (requestLevel == ResourceType_Patient && request.GetChildrenSpecification(ResourceType_Instance).IsRetrieveIdentifiers())
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	764 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	765 sql = "SELECT Lookup.internalId, grandGrandChildLevel.publicId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	766 "FROM Resources AS currentLevel "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	767 "INNER JOIN Lookup ON currentLevel.internalId = Lookup.internalId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	768 "INNER JOIN Resources childLevel ON currentLevel.internalId = childLevel.parentId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	769 "INNER JOIN Resources grandChildLevel ON childLevel.internalId = grandChildLevel.parentId "
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	770 "INNER JOIN Resources grandGrandChildLevel ON grandChildLevel.internalId = grandGrandChildLevel.parentId ";
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	771
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	772 SQLite::Statement s(db_, SQLITE_FROM_HERE, sql);
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	773 while (s.Step())
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	774 {
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	775 FindResponse::Resource& res = response.GetResourceByInternalId(s.ColumnInt64(0));
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	776 res.AddChildIdentifier(ResourceType_Instance, s.ColumnString(1));
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	777 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	778 }
f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	779
5751 5d78e5cafabc ExtendedFind in SQLite continued (all basic integration tests OK) Alain Mazy <am@orthanc.team> parents: 5750 diff changeset	780 // need resource attachments ?
5750 f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	781 if (request.IsRetrieveAttachments())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	782 {
5752 717acb0ea546 fix DICOMWeb integration tests Alain Mazy <am@orthanc.team> parents: 5751 diff changeset	783 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	784 "FROM AttachedFiles "
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	785 "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	786
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	787 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	788 while (s.Step())
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	789 {
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	790 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	791 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	792 s.ColumnInt64(3), s.ColumnString(6),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	793 static_cast<CompressionType>(s.ColumnInt(5)),
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	794 s.ColumnInt64(4), s.ColumnString(7));
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	795 res.AddAttachment(file);
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	796 }
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	797
f39406a9eda4 ExtendedFind in SQLite continued (6 tests still failing) Alain Mazy <am@orthanc.team> parents: 5748 diff changeset	798 }
5748 4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	799 }
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 diff changeset	800
4bc650d88463 WIP: started to implement IntegratedFind in SQLite Alain Mazy <am@orthanc.team> parents: 5723 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
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	803 // 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	804 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	805 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	806 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	807 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	808 s.BindInt64(0, parent);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	809 s.BindInt64(1, child);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	810 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	813
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	814 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	815 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	816 ClearTable("Changes");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	817 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	818
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	819 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	820 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	821 ClearTable("ExportedResources");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	822 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	823
1241 90d2f320862d refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 1240 diff changeset	824
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	825 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	826 {
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 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	829 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	830 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	833 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	834 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	835 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	836 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	837 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	838 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	841 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	842 int64_t& instanceId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	843 const std::string& patient,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	844 const std::string& study,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	845 const std::string& series,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	846 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	847 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	848 return ICreateInstance::Apply
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	849 (*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	850 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	851
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	852
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	853 // 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	854 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	855 ResourceType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	856 {
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	857 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	858 s.BindInt(0, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	859 s.BindString(1, publicId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	860 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	861 return db_.GetLastInsertRowId();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	862 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	863
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	864
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	865 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	866 FileContentType attachment) ORTHANC_OVERRIDE
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	867 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	868 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	869 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	870 s.BindInt(1, attachment);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	871 s.Run();
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	872 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	873
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	874
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	875 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	876 MetadataType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	877 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	878 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	879 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	880 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	881 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	882 }
193 a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	883
a1b9d1e1497b failed attempt to compile with linux standard base Sebastien Jodogne <s.jodogne@gmail.com> parents: 192 diff changeset	884
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	885 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	886 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	887 signalRemainingAncestor_.Reset();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	888
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	889 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	890 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	891 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	892
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	893 if (signalRemainingAncestor_.HasRemainingAncestor())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	894 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	895 listener_.SignalRemainingAncestor(signalRemainingAncestor_.GetRemainingAncestorType(),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	896 signalRemainingAncestor_.GetRemainingAncestorId());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	897 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	898 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	899
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	900
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	901 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	902 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	903 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	904 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	905
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	906 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	907 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	908
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	909 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	910 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	911 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	912 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	913 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	914 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	915
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	916
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	917 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	918 ResourceType resourceType) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	919 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	920 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	921 s.BindInt(0, resourceType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	922
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	923 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	924 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	925 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	926 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	927 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	928 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	929
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	930
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	931 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	932 ResourceType resourceType,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	933 int64_t since,
055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	934 uint32_t limit) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	935 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	936 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	937 "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	938 "resourceType=? LIMIT ? OFFSET ?");
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	939 s.BindInt(0, resourceType);
5774 f96abfe08946 implementation of specialized SQL commands in SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5772 diff changeset	940 s.BindInt64(1, limit == 0 ? -1 : limit); // In SQLite, setting "LIMIT" to "-1" means "no limit"
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	941 s.BindInt64(2, since);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	942
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	943 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	944 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	945 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	946 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	947 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	948 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	949
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 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	952 bool& done /out/,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	953 int64_t since,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	954 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	955 {
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	956 GetChangesExtended(target, done, since, -1, limit, ChangeType_INTERNAL_All);
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	957 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	958
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	959 virtual void GetChangesExtended(std::list<ServerIndexChange>& target /out/,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	960 bool& done /out/,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	961 int64_t since,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	962 int64_t to,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	963 uint32_t limit,
5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	964 ChangeType filterType) ORTHANC_OVERRIDE
5553 28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	965 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	966 std::vector<std::string> filters;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	967 bool hasSince = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	968 bool hasTo = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	969 bool hasFilterType = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	970
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	971 if (since > 0)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	972 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	973 hasSince = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	974 filters.push_back("seq>?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	975 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	976 if (to != -1)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	977 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	978 hasTo = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	979 filters.push_back("seq<=?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	980 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	981 if (filterType != ChangeType_INTERNAL_All)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	982 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	983 hasFilterType = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	984 filters.push_back("changeType=?");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	985 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	986
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	987 std::string filtersString;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	988 if (filters.size() > 0)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	989 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	990 Toolbox::JoinStrings(filtersString, filters, " AND ");
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	991 filtersString = "WHERE " + filtersString;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	992 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	993
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	994 std::string sql;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	995 bool returnFirstResults;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	996 if (hasTo && !hasSince)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	997 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	998 // 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	999 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	1000 returnFirstResults = false;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1001 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1002 else
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1003 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1004 // default query: we want the smallest values ordered in ascending order
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1005 sql = "SELECT * FROM Changes " + filtersString + " ORDER BY seq ASC LIMIT ?";
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1006 returnFirstResults = true;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1007 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1008
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1009 SQLite::Statement s(db_, SQLITE_FROM_HERE_DYNAMIC(sql), sql);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1010
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1011 int paramCounter = 0;
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1012 if (hasSince)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1013 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1014 s.BindInt64(paramCounter++, since);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1015 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1016 if (hasTo)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1017 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1018 s.BindInt64(paramCounter++, to);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1019 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1020 if (hasFilterType)
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1021 {
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1022 s.BindInt(paramCounter++, filterType);
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1023 }
28cc06e4859a Added ExtendedApiV1: /changes Alain Mazy <am@orthanc.team> parents: 5521 diff changeset	1024 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	1025 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	1026 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1027
4591 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 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	1030 int64_t resourceId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1031 MetadataType metadata) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1032 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1033 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	1034 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1035
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1036
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1037 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	1038 int64_t id) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1039 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1040 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	1041 "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	1042 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1043
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1044 target.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 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1047 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1048 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	1049 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1050 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1051
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1052
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1053 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	1054 int64_t id) ORTHANC_OVERRIDE
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1055 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1056 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	1057 "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	1058 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1059
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1060 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1061
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1062 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1063 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1064 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	1065 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1066 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1067
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 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	1070 bool& done,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1071 int64_t since,
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	1072 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	1073 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1074 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	1075 "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	1076 s.BindInt64(0, since);
5213 055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	1077 s.BindInt(1, limit + 1);
055428d92772 clarifying types of since/limit in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 5193 diff changeset	1078 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	1079 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1080
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 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	1083 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1084 bool done; // Ignored
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1085 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	1086 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	1087 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1088
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1089
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1090 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	1091 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1092 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	1093 "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	1094
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1095 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1096 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1097 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	1098 assert(!s.Step());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1099 return c;
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 else
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 // 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	1104 return 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1105 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1106 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1107
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 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	1110 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1111 bool done; // Ignored
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1112 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	1113 "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	1114 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	1115 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1116
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1117
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1118 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	1119 int64_t id) ORTHANC_OVERRIDE
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 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 map.Clear();
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 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	1124 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1125 while (s.Step())
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1126 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1127 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	1128 s.ColumnInt(2),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1129 s.ColumnString(3), false);
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
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 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	1135 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1136 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	1137 "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	1138 s.BindInt64(0, resourceId);
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 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1141 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1142 return s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1143 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1144 else
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 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1147 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1148 }
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
4595 cc64385593ef added OrthancPluginRegisterDatabaseBackendV3() to plugin sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 4594 diff changeset	1151 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	1152 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1153 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	1154 "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	1155 s.BindInt(0, resourceType);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1156
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1157 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1158 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1159 return 0;
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 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1162 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1163 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	1164 assert(!s.Step());
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1165 return c;
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1166 }
2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1167 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1168
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1169
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1170 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	1171 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1172 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	1173 "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	1174 s.BindInt64(0, resourceId);
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 if (s.Step())
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 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	1179 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1180 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1181 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1182 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1183 }
3809 2bf30ef727e3 enforcing SQLiteDatabaseWrapper::GetTableRecordCount() against SQL injection Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	1184 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1185
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1186
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1187 virtual uint64_t GetTotalCompressedSize() ORTHANC_OVERRIDE
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	1188 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1189 // 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	1190 // 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	1191
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1192 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	1193 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1194 return static_cast<uint64_t>(s.ColumnInt64(0));
218 0200cd330582 fixes Sebastien Jodogne <s.jodogne@gmail.com> parents: 206 diff changeset	1195 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1196
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1197
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1198 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	1199 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1200 // 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	1201 // 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	1202
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1203 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	1204 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1205 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	1206 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1209 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	1210 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1211 return GetTotalCompressedSize() > threshold;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1212 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1213
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1214
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1215 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	1216 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1217 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	1218 "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	1219 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1220 return !s.Step();
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 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	1225 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	1226 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1227 target.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1228
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1229 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	1230 "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	1231 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1232
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1233 while (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1234 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1235 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	1236 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1239
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1240 virtual void LogChange(ChangeType changeType,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1241 ResourceType resourceType,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1242 int64_t internalId,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1243 const std::string& /* publicId - unused */,
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1244 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	1245 {
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	1246 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	1247 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	1248 s.BindInt64(1, internalId);
5216 450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1249 s.BindInt(2, resourceType);
450ac804d3af simplifying IDatabaseWrapper::LogChange() Sebastien Jodogne <s.jodogne@gmail.com> parents: 5213 diff changeset	1250 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	1251 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1254
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1255 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	1256 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1257 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	1258 "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	1259
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1260 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	1261 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	1262 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	1263 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	1264 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	1265 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	1266 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	1267 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	1268 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1272 virtual bool LookupAttachment(FileInfo& attachment,
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1273 int64_t& revision,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1274 int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1275 FileContentType contentType) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1276 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1277 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	1278 "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	1279 "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	1280 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1281 s.BindInt(1, contentType);
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.Step())
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 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	1290 contentType,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1291 s.ColumnInt64(1),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1292 s.ColumnString(4),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1293 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	1294 s.ColumnInt64(3),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1295 s.ColumnString(5));
4627 f7d5372b59b3 handling revisions of attachments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4623 diff changeset	1296 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	1297 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1298 }
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
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 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	1303 GlobalProperty property,
f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1304 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	1305 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1306 // 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	1307 // 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	1308
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1309 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	1310 "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	1311 s.BindInt(0, property);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1312
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1313 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1314 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1315 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1316 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1317 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1318 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1319 target = s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1320 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1321 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1322 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1325 virtual bool LookupMetadata(std::string& target,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1326 int64_t& revision,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1327 int64_t id,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1328 MetadataType type) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1329 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1330 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	1331 "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	1332 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1333 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1334
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1335 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1336 {
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 target = s.ColumnString(0);
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1342 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	1343 return true;
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1348 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	1349 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	1350 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1351 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	1352 "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	1353 s.BindInt64(0, resourceId);
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 throw OrthancException(ErrorCode_UnknownResource);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1358 }
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 if (s.ColumnIsNull(0))
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 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1363 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1364 else
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 parentId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1367 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1368 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1369 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1370
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1371
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1372 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	1373 ResourceType& type,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1374 std::string& parentPublicId,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1375 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	1376 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1377 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	1378 }
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 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	1382 ResourceType& type,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1383 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	1384 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1385 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	1386 "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	1387 s.BindString(0, publicId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1388
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1389 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1390 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1391 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1392 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1393 else
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 id = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1396 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	1397
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1398 // 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	1399 assert(!s.Step());
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 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1402 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1403 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1406 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	1407 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1408 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	1409 "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	1410
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1411 if (!s.Step())
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 // 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	1414 return false;
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 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1417 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1418 internalId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1419 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1420 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1421 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1422
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1423
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1424 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	1425 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	1426 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1427 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	1428 "SELECT patientId FROM PatientRecyclingOrder "
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1429 "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	1430 s.BindInt64(0, patientIdToAvoid);
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 if (!s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1433 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1434 // 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	1435 return false;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1436 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1437 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1438 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1439 internalId = s.ColumnInt(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1440 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1441 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1442 }
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 virtual void SetGlobalProperty(GlobalProperty property,
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1446 bool shared,
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1447 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	1448 {
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1449 // 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	1450 // 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	1451
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	1452 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	1453 s.BindInt(0, property);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1454 s.BindString(1, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1455 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1456 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1457
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1458
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1459 // 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	1460 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	1461 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1462 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	1463 {
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	1464 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	1465 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1466 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	1467 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	1468 s.BindString(3, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1469 s.Run();
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1473 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	1474 bool isProtected) ORTHANC_OVERRIDE
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1475 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1476 if (isProtected)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1477 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1478 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	1479 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1480 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1481 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1482 else if (IsProtectedPatient(internalId))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1483 {
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	1484 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	1485 s.BindInt64(0, internalId);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1486 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1487 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1488 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1489 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1490 // 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	1491 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1492 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1493
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1494
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1495 // 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	1496 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	1497 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1498 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	1499 {
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	1500 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	1501 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1502 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	1503 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	1504 s.BindString(3, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1505 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1506 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1507
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1508
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1509 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	1510 MetadataType type,
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1511 const std::string& value,
95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1512 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	1513 {
4623 95ffe3b6ef7c handling of revisions for metadata Sebastien Jodogne <s.jodogne@gmail.com> parents: 4607 diff changeset	1514 // 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	1515 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	1516 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1517 s.BindInt(1, type);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1518 s.BindString(2, value);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1519 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1520 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1521
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1522
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1523 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	1524 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1525 ISetResourcesContent::Apply(*this, content);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1526 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1527
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1528
4592 36bbf3169a27 comments Sebastien Jodogne <s.jodogne@gmail.com> parents: 4591 diff changeset	1529 // 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	1530 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	1531 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1532 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1533 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	1534 "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	1535 s.BindInt64(0, patient);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1536 s.Run();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1537
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1538 assert(db_.GetLastChangeCount() == 0 \|\|
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1539 db_.GetLastChangeCount() == 1);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1540
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1541 if (db_.GetLastChangeCount() == 0)
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 // 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	1544 return;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1545 }
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1548 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1549 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	1550 "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	1551 s.BindInt64(0, patient);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1552 s.Run();
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 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1555
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1556
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1557 virtual void AddLabel(int64_t resource,
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1558 const std::string& label) ORTHANC_OVERRIDE
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1559 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1560 if (label.empty())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1561 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1562 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1563 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1564 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1565 {
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1566 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	1567 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1568 s.BindString(1, label);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1569 s.Run();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1570 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1571 }
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1572
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1573
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1574 virtual void RemoveLabel(int64_t resource,
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1575 const std::string& label) ORTHANC_OVERRIDE
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1576 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1577 if (label.empty())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1578 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1579 throw OrthancException(ErrorCode_ParameterOutOfRange);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1580 }
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1581 else
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1582 {
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1583 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	1584 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1585 s.BindString(1, label);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1586 s.Run();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1587 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1588 }
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1589
df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1590
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1591 virtual void ListLabels(std::set<std::string>& target,
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1592 int64_t resource) ORTHANC_OVERRIDE
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1593 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1594 target.clear();
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1595
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1596 SQLite::Statement s(db_, SQLITE_FROM_HERE,
5256 261ce0ed85e6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 5249 diff changeset	1597 "SELECT label FROM Labels WHERE id=?");
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1598 s.BindInt64(0, resource);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1599
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1600 while (s.Step())
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1601 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1602 target.insert(s.ColumnString(0));
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1603 }
5220 df39c7583a49 preparing virtual methods for labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5216 diff changeset	1604 }
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	1605
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	1606
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	1607 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	1608 {
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	1609 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	1610
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	1611 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	1612 "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	1613
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	1614 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	1615 {
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	1616 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	1617 }
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	1618 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1619 };
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1622 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	1623 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1624 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1625 SQLiteDatabaseWrapper& sqlite_;
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 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1628 SignalFileDeleted(SQLiteDatabaseWrapper& sqlite) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1629 sqlite_(sqlite)
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 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1632
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1633 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	1634 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1635 return "SignalFileDeleted";
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1636 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1637
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1638 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	1639 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1640 return 7;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1641 }
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 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	1644 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1645 if (sqlite_.activeTransaction_ != NULL)
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 std::string uncompressedMD5, compressedMD5;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1648
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1649 if (!context.IsNullValue(5))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1650 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1651 uncompressedMD5 = context.GetStringValue(5);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1652 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1653
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1654 if (!context.IsNullValue(6))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1655 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1656 compressedMD5 = context.GetStringValue(6);
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 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	1660 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	1661 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	1662 uncompressedMD5,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1663 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	1664 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	1665 compressedMD5);
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 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	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 };
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1673 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	1674 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1675 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1676 SQLiteDatabaseWrapper& sqlite_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1677
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1678 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1679 SignalResourceDeleted(SQLiteDatabaseWrapper& sqlite) :
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1680 sqlite_(sqlite)
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 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	1685 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1686 return "SignalResourceDeleted";
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1687 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1688
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1689 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	1690 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1691 return 2;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1692 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1693
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1694 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	1695 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1696 if (sqlite_.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 sqlite_.activeTransaction_->GetListener().
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1699 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	1700 context.GetStringValue(0));
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1701 }
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
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 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	1707 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1708 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1709 SQLiteDatabaseWrapper& that_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1710 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	1711 int64_t initialDiskSize_;
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 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1714 ReadWriteTransaction(SQLiteDatabaseWrapper& that,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1715 IDatabaseListener& listener) :
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	1716 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	1717 that_(that),
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1718 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	1719 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1720 if (that_.activeTransaction_ != NULL)
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 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1723 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1724
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1725 that_.activeTransaction_ = this;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1726
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1727 #if defined(NDEBUG)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1728 // Release mode
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1729 initialDiskSize_ = 0;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1730 #else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1731 // Debug mode
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1732 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	1733 #endif
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1734 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1735
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1736 virtual ~ReadWriteTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1737 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1738 assert(that_.activeTransaction_ != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1739 that_.activeTransaction_ = NULL;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1740 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1741
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1742 void Begin()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1743 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1744 transaction_->Begin();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1745 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1746
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1747 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	1748 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1749 transaction_->Rollback();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1750 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1751
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1752 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	1753 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1754 transaction_->Commit();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1755
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1756 assert(initialDiskSize_ + fileSizeDelta >= 0 &&
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1757 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	1758 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1759 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1760
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1761
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1762 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	1763 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1764 private:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1765 SQLiteDatabaseWrapper& that_;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1766
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1767 public:
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1768 ReadOnlyTransaction(SQLiteDatabaseWrapper& that,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1769 IDatabaseListener& listener) :
5521 0d0f8788884a removed unused variable dbCapabilities_ in SQLiteDatabaseWrapper::TransactionBase Sebastien Jodogne <s.jodogne@gmail.com> parents: 5519 diff changeset	1770 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	1771 that_(that)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1772 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1773 if (that_.activeTransaction_ != NULL)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1774 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1775 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1776 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1777
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1778 that_.activeTransaction_ = this;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1779 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1780
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1781 virtual ~ReadOnlyTransaction()
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1782 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1783 assert(that_.activeTransaction_ != NULL);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1784 that_.activeTransaction_ = NULL;
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
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1787 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	1788 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1789 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1790
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1791 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	1792 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1793 if (fileSizeDelta != 0)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1794 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1795 throw OrthancException(ErrorCode_InternalError);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1796 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1797 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1798 };
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1799
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1800
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1801 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	1802 activeTransaction_(NULL),
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1729 diff changeset	1803 signalRemainingAncestor_(NULL),
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1804 version_(0)
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1805 {
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1806 // TODO: implement revisions in SQLite
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1807 dbCapabilities_.SetFlushToDisk(true);
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1808 dbCapabilities_.SetLabelsSupport(true);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1809 dbCapabilities_.SetHasExtendedChanges(true);
5776 de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5774 diff changeset	1810 dbCapabilities_.SetHasFindSupport(true);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1811 db_.Open(path);
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1812 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1813
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	1814
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1815 SQLiteDatabaseWrapper::SQLiteDatabaseWrapper() :
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1816 activeTransaction_(NULL),
1847 559956d5ceb2 cppcheck Sebastien Jodogne <s.jodogne@gmail.com> parents: 1729 diff changeset	1817 signalRemainingAncestor_(NULL),
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1818 version_(0)
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1819 {
5517 0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1820 // TODO: implement revisions in SQLite
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1821 dbCapabilities_.SetFlushToDisk(true);
0d433132b249 refactoring IDatabaseWrapper::Capabilities Sebastien Jodogne <s.jodogne@gmail.com> parents: 5497 diff changeset	1822 dbCapabilities_.SetLabelsSupport(true);
5757 5463c3ae3235 refactored extended /changes Alain Mazy <am@orthanc.team> parents: 5663 diff changeset	1823 dbCapabilities_.SetHasExtendedChanges(true);
5776 de33982a0bf4 wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 5774 diff changeset	1824 dbCapabilities_.SetHasFindSupport(true);
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1825 db_.OpenInMemory();
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1826 }
baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1827
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1828 SQLiteDatabaseWrapper::~SQLiteDatabaseWrapper()
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1829 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1830 if (activeTransaction_ != NULL)
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1831 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1832 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	1833 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1834 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1835
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1836
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1837 void SQLiteDatabaseWrapper::Open()
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1838 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1839 {
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1840 boost::mutex::scoped_lock lock(mutex_);
1717 3926e6317a43 SetIdentifierTagInternal Sebastien Jodogne <s.jodogne@gmail.com> parents: 1712 diff changeset	1841
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1842 if (signalRemainingAncestor_ != NULL)
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1843 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1844 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	1845 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1846
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1847 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	1848 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	1849 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	1850
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1851 db_.Execute("PRAGMA ENCODING=\"UTF-8\";");
374 42e87c17cab8 some refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 310 diff changeset	1852
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1853 // 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	1854 // 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	1855 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	1856 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	1857 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	1858 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	1859 //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	1860
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1861 // 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	1862 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	1863 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1864
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1865 VoidDatabaseListener listener;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1866
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1867 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1868 std::unique_ptr<ITransaction> transaction(StartTransaction(TransactionType_ReadOnly, listener));
1239 92c6b3b57699 cleaning Sebastien Jodogne <s.jodogne@gmail.com> parents: 1238 diff changeset	1869
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1870 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	1871 {
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1872 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	1873 std::string query;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1874 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	1875 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	1876 }
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1877
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1878 // Check the version of the database
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1879 std::string tmp;
4607 f75c63aa9de0 differentiating between shared and private global properties Sebastien Jodogne <s.jodogne@gmail.com> parents: 4595 diff changeset	1880 if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion, true /* unused in SQLite */))
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1881 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1882 tmp = "Unknown";
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1883 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1884
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1885 bool ok = false;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1886 try
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1887 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1888 LOG(INFO) << "Version of the Orthanc database: " << tmp;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1889 version_ = boost::lexical_cast<unsigned int>(tmp);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1890 ok = true;
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1891 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1892 catch (boost::bad_lexical_cast&)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1893 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1894 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1895
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1896 if (!ok)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1897 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1898 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion,
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1899 "Incompatible version of the Orthanc database: " + tmp);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1900 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1901
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1902 if (version_ == 6)
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1903 {
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1904 // 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	1905 if (!transaction->LookupGlobalProperty(tmp, GlobalProperty_GetTotalSizeIsFast, true /* unused in SQLite */) \|\|
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1906 tmp != "1")
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1907 {
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1908 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	1909 std::string query;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1910 ServerResources::GetFileResource(query, ServerResources::INSTALL_TRACK_ATTACHMENTS_SIZE);
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1911 db_.Execute(query);
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1912 }
5221 d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1913
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1914 // New in Orthanc 1.12.0
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1915 if (!db_.DoesTableExist("Labels"))
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1916 {
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1917 LOG(INFO) << "Installing the \"Labels\" table";
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1918 std::string query;
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1919 ServerResources::GetFileResource(query, ServerResources::INSTALL_LABELS_TABLE);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1920 db_.Execute(query);
d0f7c742d397 started implementation of labels Sebastien Jodogne <s.jodogne@gmail.com> parents: 5220 diff changeset	1921 }
3116 0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1922 }
0fa7181ac4e5 conrt Sebastien Jodogne <s.jodogne@gmail.com> parents: 3105 diff changeset	1923
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1924 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	1925 }
1247 32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1926 }
32fcc5dc7562 abstraction Sebastien Jodogne <s.jodogne@gmail.com> parents: 1246 diff changeset	1927
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1928
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1929 void SQLiteDatabaseWrapper::Close()
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1930 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1931 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	1932 // 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	1933 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	1934 db_.Close();
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1935 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1936
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1937
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1938 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	1939 ServerResources::FileResourceId script)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1940 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1941 std::string upgrade;
4031 e3b3af80732d ServerResources, and moving EmbeddedResourceHttpHandler from Core to OrthancServer Sebastien Jodogne <s.jodogne@gmail.com> parents: 4030 diff changeset	1942 ServerResources::GetFileResource(upgrade, script);
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1943 db.BeginTransaction();
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1944 db.Execute(upgrade);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1945 db.CommitTransaction();
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1946 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1947
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1948
3017 517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1949 void SQLiteDatabaseWrapper::Upgrade(unsigned int targetVersion,
517fc4767ae0 renamed class DatabaseWrapper as SQLiteDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 2955 diff changeset	1950 IStorageArea& storageArea)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1951 {
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	1952 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	1953
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1954 if (targetVersion != 6)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1955 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1956 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1957 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1958
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1959 // 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	1960 // 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	1961 if (version_ != 3 &&
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1962 version_ != 4 &&
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1963 version_ != 5 &&
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1964 version_ != 6)
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1965 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1966 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion);
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1967 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1968
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1969 if (version_ == 3)
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1970 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1971 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	1972 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	1973 version_ = 4;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1974 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1975
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1976 if (version_ == 4)
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1977 {
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1978 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	1979 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	1980 version_ = 5;
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	1981 }
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1982
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1983 if (version_ == 5)
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1984 {
0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	1985 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	1986 // 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	1987 // consists in reconstructing the main DICOM tags information
d72cf0c11f42 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1672 diff changeset	1988 // (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	1989
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1990 VoidDatabaseListener listener;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1991
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1992 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	1993 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	1994 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	1995 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	1996 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	1997 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	1998 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	1999 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	2000 transaction->Commit(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2001 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2002
1664 0c58f189782d prepare migration to db v6 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1615 diff changeset	2003 version_ = 6;
1729 54d78925cbb6 notes Sebastien Jodogne <s.jodogne@gmail.com> parents: 1725 diff changeset	2004 }
1615 c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2005 }
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2006
c40fe92a68e7 Primitives to upgrade the database version in plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1509 diff changeset	2007
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	2008 IDatabaseWrapper::ITransaction* SQLiteDatabaseWrapper::StartTransaction(TransactionType type,
bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	2009 IDatabaseListener& listener)
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2010 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2011 switch (type)
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2012 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2013 case TransactionType_ReadOnly:
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	2014 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	2015
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2016 case TransactionType_ReadWrite:
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2017 {
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2018 std::unique_ptr<ReadWriteTransaction> transaction;
4589 bec74e29f86b attaching the listener to transactions in IDatabaseWrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: 4571 diff changeset	2019 transaction.reset(new ReadWriteTransaction(*this, listener));
4570 648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2020 transaction->Begin();
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2021 return transaction.release();
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2022 }
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2023
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2024 default:
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2025 throw OrthancException(ErrorCode_InternalError);
648defffc8cc new enum: TransactionType Sebastien Jodogne <s.jodogne@gmail.com> parents: 4556 diff changeset	2026 }
3019 8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3018 diff changeset	2027 }
8336204d95dc refactoring computation of disk size for recycling Sebastien Jodogne <s.jodogne@gmail.com> parents: 3018 diff changeset	2028
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2029
4594 d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2030 void SQLiteDatabaseWrapper::FlushToDisk()
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2031 {
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2032 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	2033 db_.FlushToDisk();
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2034 }
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2035
d494b4f1103e removed the global database mutex from ServerIndex and StatelessDatabaseOperations Sebastien Jodogne <s.jodogne@gmail.com> parents: 4592 diff changeset	2036
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2037 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	2038 ResourceType type)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2039 {
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	2040 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	2041 s.BindInt(0, type);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2042 s.BindString(1, publicId);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2043 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2044 return db_.GetLastInsertRowId();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2045 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2046
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2047
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2048 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	2049 int64_t child)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2050 {
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2051 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	2052 s.BindInt64(0, parent);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2053 s.BindInt64(1, child);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2054 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2055 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2056
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 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 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	2059 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2060 const std::string& value)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2061 {
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	2062 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	2063 s.BindInt64(0, id);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2064 s.BindInt(1, tag.GetGroup());
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2065 s.BindInt(2, tag.GetElement());
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2066 s.BindString(3, value);
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2067 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2068 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2069
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2070
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2071 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	2072 const DicomTag& tag,
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2073 const std::string& value)
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2074 {
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	2075 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	2076 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	2077 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	2078 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	2079 s.BindString(3, value);
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2080 s.Run();
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2081 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2082
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2083
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2084 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	2085 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2086 /**
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2087 * "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	2088 * 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	2089 * 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	2090 * 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	2091 * 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	2092 * characters.
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2093 * 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	2094 **/
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2095 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	2096 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2097 if (!isalpha(table[i]))
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2098 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2099 throw OrthancException(ErrorCode_ParameterOutOfRange);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2100 }
2773 bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2101 }
bb63068844ae moving DatabaseWrapperBase into graveyard Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	2102
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2103 // 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	2104 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	2105
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2106 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	2107 {
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2108 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	2109 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	2110 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	2111 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2112 else
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2113 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2114 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	2115 }
2e1711f80f74 More consistent handling of the "Last" field returned by the "/changes" URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 3093 diff changeset	2116 }
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2117
f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2118
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2119 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	2120 int64_t id)
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2121 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2122 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	2123 "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	2124 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	2125
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2126 if (s.Step())
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2127 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2128 target = s.ColumnString(0);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2129 return true;
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2130 }
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2131 else
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2132 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2133 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	2134 }
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2135 }
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	2136
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2137
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2138 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	2139 int64_t id)
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2140 {
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2141 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	2142 s.BindInt64(0, id);
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2143
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2144 childrenPublicIds.clear();
ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2145 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	2146 {
4591 ff8170d17d90 moving all accesses to databases from IDatabaseWrapper to ITransaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 4589 diff changeset	2147 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	2148 }
3121 f86ebf971a72 fix unit tests Sebastien Jodogne <s.jodogne@gmail.com> parents: 3116 diff changeset	2149 }
183 baada606da3c databasewrapper Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2150 }

Mercurial > hg > orthanc

annotate OrthancServer/Sources/Database/SQLiteDatabaseWrapper.cpp @ 5782:f1ccb67fce31 find-refactoring