Mercurial > hg > orthanc-databases
annotate Framework/Plugins/IndexUnitTests.h @ 522:c49136b34891 large-queries tip
use a prepared statement for InsertOrUpdateMetadata
| author | Alain Mazy <am@orthanc.team> |
|---|---|
| date | Fri, 05 Jul 2024 09:15:54 +0200 |
| parents | 54d518dcd74a |
| children |
| rev | line source |
|---|---|
| 0 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
|
507
54d518dcd74a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
459
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
|
54d518dcd74a
updated copyright, as Orthanc Team now replaces Osimis
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
459
diff
changeset
|
6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium |
|
459
ecd0b719cff5
update year to 2024
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
426
diff
changeset
|
7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
| 0 | 8 * |
| 9 * This program is free software: you can redistribute it and/or | |
| 10 * modify it under the terms of the GNU Affero General Public License | |
| 11 * as published by the Free Software Foundation, either version 3 of | |
| 12 * the License, or (at your option) any later version. | |
| 13 * | |
| 14 * This program is distributed in the hope that it will be useful, but | |
| 15 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 17 * Affero General Public License for more details. | |
| 18 * | |
| 19 * You should have received a copy of the GNU Affero General Public License | |
| 20 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 21 **/ | |
| 22 | |
| 23 | |
| 24 #pragma once | |
| 25 | |
|
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
26 #include "../Common/ImplicitTransaction.h" |
|
213
c2e4a909de0e
added IndexBackend::Register() to be used in all the index plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
209
diff
changeset
|
27 #include "DatabaseBackendAdapterV2.h" |
| 152 | 28 #include "GlobalProperties.h" |
|
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
29 |
|
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
30 #include <Compatibility.h> // For std::unique_ptr<> |
|
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
31 |
| 0 | 32 #include <orthanc/OrthancCDatabasePlugin.h> |
| 33 | |
| 34 #include <gtest/gtest.h> | |
| 35 #include <list> | |
| 36 | |
|
273
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
37 #if !defined(ORTHANC_DATABASE_VERSION) |
|
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
38 // This happens if using the Orthanc framework system-wide library |
|
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
39 # define ORTHANC_DATABASE_VERSION 6 |
|
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
40 #endif |
|
07881ac5404b
fix build against system-wide orthanc framework
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
266
diff
changeset
|
41 |
| 0 | 42 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
43 #if ORTHANC_ENABLE_POSTGRESQL == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
44 # define HAS_REVISIONS 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
45 #elif ORTHANC_ENABLE_MYSQL == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
46 # define HAS_REVISIONS 0 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
47 #elif ORTHANC_ENABLE_SQLITE == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
48 # define HAS_REVISIONS 1 |
|
309
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
49 #elif ORTHANC_ENABLE_ODBC == 1 |
|
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
50 # define HAS_REVISIONS 1 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
51 #else |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
52 # error Unknown database backend |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
53 #endif |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
54 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
55 |
| 152 | 56 namespace Orthanc |
| 57 { | |
| 58 /** | |
| 59 * Mock enumeration inspired from the source code of Orthanc... only | |
| 60 * for use in the unit tests! | |
|
426
d700c8f9fc24
migration to UCLouvain servers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
403
diff
changeset
|
61 * https://orthanc.uclouvain.be/hg/orthanc/file/default/OrthancServer/Sources/ServerEnumerations.h |
| 152 | 62 **/ |
| 63 enum MetadataType | |
| 64 { | |
| 65 MetadataType_ModifiedFrom, | |
| 66 MetadataType_LastUpdate | |
| 67 }; | |
| 68 } | |
| 69 | |
| 70 | |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
71 /** |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
72 * This is a sample UTF8 string that is the concatenation of a Korean |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
73 * and a Kanji text. Check out "utf8raw" in |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
74 * "OrthancFramework/UnitTestsSources/FromDcmtkTests.cpp" for the |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
75 * sources of these binary values. |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
76 **/ |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
77 static const uint8_t UTF8[] = { |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
78 // cf. TEST(Toolbox, EncodingsKorean) |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
79 0x48, 0x6f, 0x6e, 0x67, 0x5e, 0x47, 0x69, 0x6c, 0x64, 0x6f, 0x6e, 0x67, 0x3d, 0xe6, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
80 0xb4, 0xaa, 0x5e, 0xe5, 0x90, 0x89, 0xe6, 0xb4, 0x9e, 0x3d, 0xed, 0x99, 0x8d, 0x5e, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
81 0xea, 0xb8, 0xb8, 0xeb, 0x8f, 0x99, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
82 |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
83 // cf. TEST(Toolbox, EncodingsJapaneseKanji) |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
84 0x59, 0x61, 0x6d, 0x61, 0x64, 0x61, 0x5e, 0x54, 0x61, 0x72, 0x6f, 0x75, 0x3d, 0xe5, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
85 0xb1, 0xb1, 0xe7, 0x94, 0xb0, 0x5e, 0xe5, 0xa4, 0xaa, 0xe9, 0x83, 0x8e, 0x3d, 0xe3, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
86 0x82, 0x84, 0xe3, 0x81, 0xbe, 0xe3, 0x81, 0xa0, 0x5e, 0xe3, 0x81, 0x9f, 0xe3, 0x82, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
87 0x8d, 0xe3, 0x81, 0x86, |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
88 |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
89 // End of text |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
90 0x00 |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
91 }; |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
92 |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
93 |
|
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
94 static std::unique_ptr<OrthancPluginAttachment> expectedAttachment; |
| 0 | 95 static std::list<OrthancPluginDicomTag> expectedDicomTags; |
|
157
275e14f57f1e
replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
152
diff
changeset
|
96 static std::unique_ptr<OrthancPluginExportedResource> expectedExported; |
| 0 | 97 |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
98 static std::map<std::string, OrthancPluginResourceType> deletedResources; |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
99 static std::unique_ptr< std::pair<std::string, OrthancPluginResourceType> > remainingAncestor; |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
100 static std::set<std::string> deletedAttachments; |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
101 static unsigned int countDicomTags = 0; |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
102 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
103 |
| 0 | 104 static void CheckAttachment(const OrthancPluginAttachment& attachment) |
| 105 { | |
| 106 ASSERT_STREQ(expectedAttachment->uuid, attachment.uuid); | |
| 107 ASSERT_EQ(expectedAttachment->contentType, attachment.contentType); | |
| 108 ASSERT_EQ(expectedAttachment->uncompressedSize, attachment.uncompressedSize); | |
| 109 ASSERT_STREQ(expectedAttachment->uncompressedHash, attachment.uncompressedHash); | |
| 110 ASSERT_EQ(expectedAttachment->compressionType, attachment.compressionType); | |
| 111 ASSERT_EQ(expectedAttachment->compressedSize, attachment.compressedSize); | |
| 112 ASSERT_STREQ(expectedAttachment->compressedHash, attachment.compressedHash); | |
| 113 } | |
| 114 | |
| 115 static void CheckExportedResource(const OrthancPluginExportedResource& exported) | |
| 116 { | |
|
311
5f0d5f849944
fix unit tests if resuning the same database
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
309
diff
changeset
|
117 // ASSERT_EQ(expectedExported->seq, exported.seq); |
| 0 | 118 ASSERT_EQ(expectedExported->resourceType, exported.resourceType); |
| 119 ASSERT_STREQ(expectedExported->publicId, exported.publicId); | |
| 120 ASSERT_STREQ(expectedExported->modality, exported.modality); | |
| 121 ASSERT_STREQ(expectedExported->date, exported.date); | |
| 122 ASSERT_STREQ(expectedExported->patientId, exported.patientId); | |
| 123 ASSERT_STREQ(expectedExported->studyInstanceUid, exported.studyInstanceUid); | |
| 124 ASSERT_STREQ(expectedExported->seriesInstanceUid, exported.seriesInstanceUid); | |
| 125 ASSERT_STREQ(expectedExported->sopInstanceUid, exported.sopInstanceUid); | |
| 126 } | |
| 127 | |
| 128 static void CheckDicomTag(const OrthancPluginDicomTag& tag) | |
| 129 { | |
| 130 for (std::list<OrthancPluginDicomTag>::const_iterator | |
| 131 it = expectedDicomTags.begin(); it != expectedDicomTags.end(); ++it) | |
| 132 { | |
| 133 if (it->group == tag.group && | |
| 134 it->element == tag.element && | |
| 135 !strcmp(it->value, tag.value)) | |
| 136 { | |
| 137 // OK, match | |
| 138 return; | |
| 139 } | |
| 140 } | |
| 141 | |
| 142 ASSERT_TRUE(0); // Error | |
| 143 } | |
| 144 | |
| 145 | |
| 146 | |
| 147 static OrthancPluginErrorCode InvokeService(struct _OrthancPluginContext_t* context, | |
| 148 _OrthancPluginService service, | |
| 149 const void* params) | |
| 150 { | |
| 199 | 151 switch (service) |
| 0 | 152 { |
| 199 | 153 case _OrthancPluginService_DatabaseAnswer: |
| 0 | 154 { |
| 199 | 155 const _OrthancPluginDatabaseAnswer& answer = |
| 156 *reinterpret_cast<const _OrthancPluginDatabaseAnswer*>(params); | |
| 157 | |
| 158 switch (answer.type) | |
| 0 | 159 { |
| 199 | 160 case _OrthancPluginDatabaseAnswerType_Attachment: |
| 161 { | |
| 162 const OrthancPluginAttachment& attachment = | |
| 163 *reinterpret_cast<const OrthancPluginAttachment*>(answer.valueGeneric); | |
| 164 CheckAttachment(attachment); | |
| 165 break; | |
| 166 } | |
| 167 | |
| 168 case _OrthancPluginDatabaseAnswerType_ExportedResource: | |
| 169 { | |
| 170 const OrthancPluginExportedResource& attachment = | |
| 171 *reinterpret_cast<const OrthancPluginExportedResource*>(answer.valueGeneric); | |
| 172 CheckExportedResource(attachment); | |
| 173 break; | |
| 174 } | |
| 175 | |
| 176 case _OrthancPluginDatabaseAnswerType_DicomTag: | |
| 177 { | |
| 178 const OrthancPluginDicomTag& tag = | |
| 179 *reinterpret_cast<const OrthancPluginDicomTag*>(answer.valueGeneric); | |
| 180 CheckDicomTag(tag); | |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
181 countDicomTags++; |
| 199 | 182 break; |
| 183 } | |
| 184 | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
185 case _OrthancPluginDatabaseAnswerType_DeletedResource: |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
186 deletedResources[answer.valueString] = static_cast<OrthancPluginResourceType>(answer.valueInt32); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
187 break; |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
188 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
189 case _OrthancPluginDatabaseAnswerType_RemainingAncestor: |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
190 remainingAncestor.reset(new std::pair<std::string, OrthancPluginResourceType>()); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
191 *remainingAncestor = std::make_pair(answer.valueString, static_cast<OrthancPluginResourceType>(answer.valueInt32)); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
192 break; |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
193 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
194 case _OrthancPluginDatabaseAnswerType_DeletedAttachment: |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
195 deletedAttachments.insert(reinterpret_cast<const OrthancPluginAttachment*>(answer.valueGeneric)->uuid); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
196 break; |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
197 |
| 199 | 198 default: |
| 199 printf("Unhandled message: %d\n", answer.type); | |
| 200 break; | |
| 0 | 201 } |
| 202 | |
| 199 | 203 return OrthancPluginErrorCode_Success; |
| 204 } | |
| 0 | 205 |
| 199 | 206 case _OrthancPluginService_GetExpectedDatabaseVersion: |
| 207 { | |
| 208 const _OrthancPluginReturnSingleValue& p = | |
| 209 *reinterpret_cast<const _OrthancPluginReturnSingleValue*>(params); | |
| 210 *(p.resultUint32) = ORTHANC_DATABASE_VERSION; | |
| 211 return OrthancPluginErrorCode_Success; | |
| 212 } | |
| 0 | 213 |
| 199 | 214 default: |
| 215 assert(0); | |
| 216 printf("Service not emulated: %d\n", service); | |
| 217 return OrthancPluginErrorCode_NotImplemented; | |
| 0 | 218 } |
| 219 } | |
| 220 | |
| 221 | |
| 222 TEST(IndexBackend, Basic) | |
| 223 { | |
| 224 using namespace OrthancDatabases; | |
| 225 | |
| 226 OrthancPluginContext context; | |
| 227 context.pluginsManager = NULL; | |
| 228 context.orthancVersion = "mainline"; | |
| 229 context.Free = ::free; | |
| 230 context.InvokeService = InvokeService; | |
| 231 | |
|
28
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
232 ImplicitTransaction::SetErrorOnDoubleExecution(true); |
|
c0cb5d2cd696
checks depending on Orthanc version
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
27
diff
changeset
|
233 |
| 0 | 234 #if ORTHANC_ENABLE_POSTGRESQL == 1 |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
235 PostgreSQLIndex db(&context, globalParameters_); |
| 0 | 236 db.SetClearAll(true); |
| 237 #elif ORTHANC_ENABLE_MYSQL == 1 | |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
238 MySQLIndex db(&context, globalParameters_); |
| 0 | 239 db.SetClearAll(true); |
|
309
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
240 #elif ORTHANC_ENABLE_ODBC == 1 |
|
d192bfd0e752
tagging globalParameters_ as static in MySQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
307
diff
changeset
|
241 OdbcIndex db(&context, connectionString_); |
| 319 | 242 #elif ORTHANC_ENABLE_SQLITE == 1 // Must be the last one |
| 243 SQLiteIndex db(&context); // Open in memory | |
| 0 | 244 #else |
| 245 # error Unsupported database backend | |
| 246 #endif | |
| 247 | |
| 204 | 248 db.SetOutputFactory(new DatabaseBackendAdapterV2::Factory(&context, NULL)); |
|
201
42990b2dd51b
create IDatabaseBackendOutput only if needed
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
249 |
|
403
91124cc8a8c7
database plugins are informed about the identifier tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
250 std::list<IdentifierTag> identifierTags; |
|
91124cc8a8c7
database plugins are informed about the identifier tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
389
diff
changeset
|
251 std::unique_ptr<DatabaseManager> manager(IndexBackend::CreateSingleDatabaseManager(db, false, identifierTags)); |
|
225
94c9908e6aca
removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
221
diff
changeset
|
252 |
|
203
2089d4071408
moving classes out of OrthancPlugins namespace, to OrthancDatabases
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
201
diff
changeset
|
253 std::unique_ptr<IDatabaseBackendOutput> output(db.CreateOutput()); |
| 0 | 254 |
| 255 std::string s; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
256 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion)); |
| 0 | 257 ASSERT_EQ("6", s); |
| 258 | |
|
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
259 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9, "Hello"); |
|
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
260 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
| 0 | 261 ASSERT_EQ("Hello", s); |
|
239
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
262 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9, "HelloWorld"); |
|
e9ba888f371b
fix IndexBackend::SetGlobalProperty(), lighten GlobalProperty enum
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
226
diff
changeset
|
263 ASSERT_TRUE(db.LookupGlobalProperty(s, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal9)); |
| 0 | 264 ASSERT_EQ("HelloWorld", s); |
| 265 | |
| 301 | 266 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
| 267 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Patient)); | |
| 268 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Study)); | |
| 269 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Series)); | |
| 270 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
271 int64_t a = db.CreateResource(*manager, "study", OrthancPluginResourceType_Study); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
272 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
273 ASSERT_FALSE(db.IsExistingResource(*manager, a + 1)); |
| 0 | 274 |
| 275 int64_t b; | |
| 276 OrthancPluginResourceType t; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
277 ASSERT_FALSE(db.LookupResource(b, t, *manager, "world")); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
278 ASSERT_TRUE(db.LookupResource(b, t, *manager, "study")); |
| 0 | 279 ASSERT_EQ(a, b); |
| 280 ASSERT_EQ(OrthancPluginResourceType_Study, t); | |
| 281 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
282 b = db.CreateResource(*manager, "series", OrthancPluginResourceType_Series); |
| 0 | 283 ASSERT_NE(a, b); |
| 284 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
285 ASSERT_EQ("study", db.GetPublicId(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
286 ASSERT_EQ("series", db.GetPublicId(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
287 ASSERT_EQ(OrthancPluginResourceType_Study, db.GetResourceType(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
288 ASSERT_EQ(OrthancPluginResourceType_Series, db.GetResourceType(*manager, b)); |
| 0 | 289 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
290 db.AttachChild(*manager, a, b); |
| 0 | 291 |
| 292 int64_t c; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
293 ASSERT_FALSE(db.LookupParent(c, *manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
294 ASSERT_TRUE(db.LookupParent(c, *manager, b)); |
| 0 | 295 ASSERT_EQ(a, c); |
| 296 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
297 c = db.CreateResource(*manager, "series2", OrthancPluginResourceType_Series); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
298 db.AttachChild(*manager, a, c); |
| 0 | 299 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
300 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
301 ASSERT_EQ(0u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Patient)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
302 ASSERT_EQ(1u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Study)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
303 ASSERT_EQ(2u, db.GetResourcesCount(*manager, OrthancPluginResourceType_Series)); |
| 0 | 304 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
305 ASSERT_FALSE(db.GetParentPublicId(s, *manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
306 ASSERT_TRUE(db.GetParentPublicId(s, *manager, b)); ASSERT_EQ("study", s); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
307 ASSERT_TRUE(db.GetParentPublicId(s, *manager, c)); ASSERT_EQ("study", s); |
| 0 | 308 |
| 309 std::list<std::string> children; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
310 db.GetChildren(children, *manager, a); |
| 0 | 311 ASSERT_EQ(2u, children.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
312 db.GetChildren(children, *manager, b); |
| 0 | 313 ASSERT_EQ(0u, children.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
314 db.GetChildren(children, *manager, c); |
| 0 | 315 ASSERT_EQ(0u, children.size()); |
| 316 | |
| 317 std::list<std::string> cp; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
318 db.GetChildrenPublicId(cp, *manager, a); |
| 0 | 319 ASSERT_EQ(2u, cp.size()); |
| 320 ASSERT_TRUE(cp.front() == "series" || cp.front() == "series2"); | |
| 321 ASSERT_TRUE(cp.back() == "series" || cp.back() == "series2"); | |
| 322 ASSERT_NE(cp.front(), cp.back()); | |
| 323 | |
| 324 std::list<std::string> pub; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
325 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Patient); |
| 0 | 326 ASSERT_EQ(0u, pub.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
327 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Study); |
| 0 | 328 ASSERT_EQ(1u, pub.size()); |
| 329 ASSERT_EQ("study", pub.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
330 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Series); |
| 0 | 331 ASSERT_EQ(2u, pub.size()); |
| 332 ASSERT_TRUE(pub.front() == "series" || pub.front() == "series2"); | |
| 333 ASSERT_TRUE(pub.back() == "series" || pub.back() == "series2"); | |
| 334 ASSERT_NE(pub.front(), pub.back()); | |
| 335 | |
| 336 std::list<int64_t> ci; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
337 db.GetChildrenInternalId(ci, *manager, a); |
| 0 | 338 ASSERT_EQ(2u, ci.size()); |
| 339 ASSERT_TRUE(ci.front() == b || ci.front() == c); | |
| 340 ASSERT_TRUE(ci.back() == b || ci.back() == c); | |
| 341 ASSERT_NE(ci.front(), ci.back()); | |
| 342 | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
343 db.SetMetadata(*manager, a, Orthanc::MetadataType_ModifiedFrom, "modified", 42); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
344 db.SetMetadata(*manager, a, Orthanc::MetadataType_LastUpdate, "update2", 43); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
345 int64_t revision = -1; |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
346 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, b, Orthanc::MetadataType_LastUpdate)); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
347 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 348 ASSERT_EQ("update2", s); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
349 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
350 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
351 ASSERT_EQ(43, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
352 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
353 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
354 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
355 |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
356 db.SetMetadata(*manager, a, Orthanc::MetadataType_LastUpdate, reinterpret_cast<const char*>(UTF8), 44); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
357 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
358 ASSERT_STREQ(reinterpret_cast<const char*>(UTF8), s.c_str()); |
| 0 | 359 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
360 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
361 ASSERT_EQ(44, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
362 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
363 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
364 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
365 |
| 0 | 366 std::list<int32_t> md; |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
367 db.ListAvailableMetadata(md, *manager, a); |
| 0 | 368 ASSERT_EQ(2u, md.size()); |
| 369 ASSERT_TRUE(md.front() == Orthanc::MetadataType_ModifiedFrom || md.back() == Orthanc::MetadataType_ModifiedFrom); | |
| 370 ASSERT_TRUE(md.front() == Orthanc::MetadataType_LastUpdate || md.back() == Orthanc::MetadataType_LastUpdate); | |
| 371 std::string mdd; | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
372 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_ModifiedFrom)); |
| 0 | 373 ASSERT_EQ("modified", mdd); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
374 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
375 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
376 ASSERT_EQ(42, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
377 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
378 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
379 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
380 |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
381 ASSERT_TRUE(db.LookupMetadata(mdd, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
382 ASSERT_EQ(reinterpret_cast<const char*>(UTF8), mdd); |
| 0 | 383 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
384 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
385 ASSERT_EQ(44, revision); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
386 #else |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
387 ASSERT_EQ(0, revision); |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
388 #endif |
|
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
389 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
390 db.ListAvailableMetadata(md, *manager, b); |
| 0 | 391 ASSERT_EQ(0u, md.size()); |
| 392 | |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
393 ASSERT_TRUE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
394 db.DeleteMetadata(*manager, a, Orthanc::MetadataType_LastUpdate); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
395 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
396 db.DeleteMetadata(*manager, b, Orthanc::MetadataType_LastUpdate); |
|
256
e184dcadf163
handling of revisions in metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
239
diff
changeset
|
397 ASSERT_FALSE(db.LookupMetadata(s, revision, *manager, a, Orthanc::MetadataType_LastUpdate)); |
| 0 | 398 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
399 db.ListAvailableMetadata(md, *manager, a); |
| 0 | 400 ASSERT_EQ(1u, md.size()); |
| 401 ASSERT_EQ(Orthanc::MetadataType_ModifiedFrom, md.front()); | |
| 402 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
403 ASSERT_EQ(0u, db.GetTotalCompressedSize(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
404 ASSERT_EQ(0u, db.GetTotalUncompressedSize(*manager)); |
| 0 | 405 |
| 406 | |
| 407 std::list<int32_t> fc; | |
| 408 | |
| 409 OrthancPluginAttachment a1; | |
| 410 a1.uuid = "uuid1"; | |
| 411 a1.contentType = Orthanc::FileContentType_Dicom; | |
| 412 a1.uncompressedSize = 42; | |
| 413 a1.uncompressedHash = "md5_1"; | |
| 414 a1.compressionType = Orthanc::CompressionType_None; | |
| 415 a1.compressedSize = 42; | |
| 416 a1.compressedHash = "md5_1"; | |
| 417 | |
| 418 OrthancPluginAttachment a2; | |
| 419 a2.uuid = "uuid2"; | |
| 420 a2.contentType = Orthanc::FileContentType_DicomAsJson; | |
| 421 a2.uncompressedSize = 4242; | |
| 422 a2.uncompressedHash = "md5_2"; | |
| 423 a2.compressionType = Orthanc::CompressionType_None; | |
| 424 a2.compressedSize = 4242; | |
| 425 a2.compressedHash = "md5_2"; | |
| 426 | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
427 db.AddAttachment(*manager, a, a1, 42); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
428 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 429 ASSERT_EQ(1u, fc.size()); |
| 430 ASSERT_EQ(Orthanc::FileContentType_Dicom, fc.front()); | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
431 db.AddAttachment(*manager, a, a2, 43); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
432 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 433 ASSERT_EQ(2u, fc.size()); |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
434 ASSERT_FALSE(db.LookupAttachment(*output, revision, *manager, b, Orthanc::FileContentType_Dicom)); |
| 0 | 435 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
436 ASSERT_EQ(4284u, db.GetTotalCompressedSize(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
437 ASSERT_EQ(4284u, db.GetTotalUncompressedSize(*manager)); |
| 0 | 438 |
| 439 expectedAttachment.reset(new OrthancPluginAttachment); | |
| 440 expectedAttachment->uuid = "uuid1"; | |
| 441 expectedAttachment->contentType = Orthanc::FileContentType_Dicom; | |
| 442 expectedAttachment->uncompressedSize = 42; | |
| 443 expectedAttachment->uncompressedHash = "md5_1"; | |
| 444 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
| 445 expectedAttachment->compressedSize = 42; | |
| 446 expectedAttachment->compressedHash = "md5_1"; | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
447 ASSERT_TRUE(db.LookupAttachment(*output, revision, *manager, a, Orthanc::FileContentType_Dicom)); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
448 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
449 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
450 ASSERT_EQ(42, revision); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
451 #else |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
452 ASSERT_EQ(0, revision); |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
453 #endif |
| 0 | 454 |
| 455 expectedAttachment.reset(new OrthancPluginAttachment); | |
| 456 expectedAttachment->uuid = "uuid2"; | |
| 457 expectedAttachment->contentType = Orthanc::FileContentType_DicomAsJson; | |
| 458 expectedAttachment->uncompressedSize = 4242; | |
| 459 expectedAttachment->uncompressedHash = "md5_2"; | |
| 460 expectedAttachment->compressionType = Orthanc::CompressionType_None; | |
| 461 expectedAttachment->compressedSize = 4242; | |
| 462 expectedAttachment->compressedHash = "md5_2"; | |
|
261
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
463 revision = -1; |
|
34e2b93a7ac1
implementing interface for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
256
diff
changeset
|
464 ASSERT_TRUE(db.LookupAttachment(*output, revision, *manager, a, Orthanc::FileContentType_DicomAsJson)); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
465 |
|
266
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
466 #if HAS_REVISIONS == 1 |
|
cc7af42d4f23
Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
467 ASSERT_EQ(43, revision); |
|
262
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
468 #else |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
469 ASSERT_EQ(0, revision); |
|
b0c65094b299
adding support for revisions in attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
261
diff
changeset
|
470 #endif |
| 0 | 471 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
472 db.ListAvailableAttachments(fc, *manager, b); |
| 0 | 473 ASSERT_EQ(0u, fc.size()); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
474 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_Dicom); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
475 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 476 ASSERT_EQ(1u, fc.size()); |
| 477 ASSERT_EQ(Orthanc::FileContentType_DicomAsJson, fc.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
478 db.DeleteAttachment(*output, *manager, a, Orthanc::FileContentType_DicomAsJson); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
479 db.ListAvailableAttachments(fc, *manager, a); |
| 0 | 480 ASSERT_EQ(0u, fc.size()); |
| 481 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
482 db.SetIdentifierTag(*manager, a, 0x0010, 0x0020, "patient"); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
483 db.SetIdentifierTag(*manager, a, 0x0020, 0x000d, "study"); |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
484 db.SetMainDicomTag(*manager, a, 0x0010, 0x0020, "patient"); |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
485 db.SetMainDicomTag(*manager, a, 0x0020, 0x000d, "study"); |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
486 db.SetMainDicomTag(*manager, a, 0x0008, 0x1030, reinterpret_cast<const char*>(UTF8)); |
| 0 | 487 |
| 488 expectedDicomTags.clear(); | |
| 489 expectedDicomTags.push_back(OrthancPluginDicomTag()); | |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
490 expectedDicomTags.back().group = 0x0010; |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
491 expectedDicomTags.back().element = 0x0020; |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
492 expectedDicomTags.back().value = "patient"; |
| 0 | 493 expectedDicomTags.push_back(OrthancPluginDicomTag()); |
| 494 expectedDicomTags.back().group = 0x0020; | |
| 495 expectedDicomTags.back().element = 0x000d; | |
| 496 expectedDicomTags.back().value = "study"; | |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
497 expectedDicomTags.push_back(OrthancPluginDicomTag()); |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
498 expectedDicomTags.back().group = 0x0008; |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
499 expectedDicomTags.back().element = 0x1030; |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
500 expectedDicomTags.back().value = reinterpret_cast<const char*>(UTF8); |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
501 |
|
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
502 countDicomTags = 0; |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
503 db.GetMainDicomTags(*output, *manager, a); |
|
335
7ec461718edb
unit test of metadata and tags in UTF8
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
321
diff
changeset
|
504 ASSERT_EQ(3u, countDicomTags); |
| 0 | 505 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
506 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
| 0 | 507 OrthancPluginIdentifierConstraint_Equal, "patient"); |
| 508 ASSERT_EQ(1u, ci.size()); | |
| 509 ASSERT_EQ(a, ci.front()); | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
510 db.LookupIdentifier(ci, *manager, OrthancPluginResourceType_Study, 0x0010, 0x0020, |
| 0 | 511 OrthancPluginIdentifierConstraint_Equal, "study"); |
| 512 ASSERT_EQ(0u, ci.size()); | |
| 513 | |
| 514 | |
|
378
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
515 db.LogExportedResource(*manager, OrthancPluginResourceType_Study, "id", "remote", "date", |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
516 "patient", "study", "series", "instance"); |
| 0 | 517 |
| 518 expectedExported.reset(new OrthancPluginExportedResource()); | |
|
378
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
519 expectedExported->seq = -1; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
520 expectedExported->resourceType = OrthancPluginResourceType_Study; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
521 expectedExported->publicId = "id"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
522 expectedExported->modality = "remote"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
523 expectedExported->date = "date"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
524 expectedExported->patientId = "patient"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
525 expectedExported->studyInstanceUid = "study"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
526 expectedExported->seriesInstanceUid = "series"; |
|
9db9e0275ec0
refactoring IndexBackend::LogExportedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
359
diff
changeset
|
527 expectedExported->sopInstanceUid = "instance"; |
| 0 | 528 |
| 529 bool done; | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
530 db.GetExportedResources(*output, done, *manager, 0, 10); |
| 0 | 531 |
| 532 | |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
533 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Patient); ASSERT_EQ(0u, pub.size()); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
534 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Study); ASSERT_EQ(1u, pub.size()); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
535 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Series); ASSERT_EQ(2u, pub.size()); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
536 db.GetAllPublicIds(pub, *manager, OrthancPluginResourceType_Instance); ASSERT_EQ(0u, pub.size()); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
537 ASSERT_EQ(3u, db.GetAllResourcesCount(*manager)); |
| 0 | 538 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
539 ASSERT_EQ(0u, db.GetUnprotectedPatientsCount(*manager)); // No patient was inserted |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
540 ASSERT_TRUE(db.IsExistingResource(*manager, c)); |
|
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
541 |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
542 { |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
543 // A transaction is needed here for MySQL, as it was not possible |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
544 // to implement recursive deletion of resources using pure SQL |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
545 // statements |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
546 manager->StartTransaction(TransactionType_ReadWrite); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
547 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
548 deletedAttachments.clear(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
549 deletedResources.clear(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
550 remainingAncestor.reset(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
551 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
552 db.DeleteResource(*output, *manager, c); |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
553 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
554 ASSERT_EQ(0u, deletedAttachments.size()); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
555 ASSERT_EQ(1u, deletedResources.size()); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
556 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series2"]); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
557 ASSERT_TRUE(remainingAncestor.get() != NULL); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
558 ASSERT_EQ("study", remainingAncestor->first); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
559 ASSERT_EQ(OrthancPluginResourceType_Study, remainingAncestor->second); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
560 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
561 manager->CommitTransaction(); |
|
27
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
562 } |
|
173176f8cef2
jobs branch has disappeared in orthanc
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
26
diff
changeset
|
563 |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
564 deletedAttachments.clear(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
565 deletedResources.clear(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
566 remainingAncestor.reset(); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
567 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
568 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
569 ASSERT_TRUE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
570 ASSERT_TRUE(db.IsExistingResource(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
571 ASSERT_EQ(2u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
572 db.DeleteResource(*output, *manager, a); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
573 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
574 ASSERT_FALSE(db.IsExistingResource(*manager, a)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
575 ASSERT_FALSE(db.IsExistingResource(*manager, b)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
576 ASSERT_FALSE(db.IsExistingResource(*manager, c)); |
| 0 | 577 |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
578 ASSERT_EQ(0u, deletedAttachments.size()); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
579 ASSERT_EQ(2u, deletedResources.size()); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
580 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
581 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
582 ASSERT_FALSE(remainingAncestor.get() != NULL); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
583 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
584 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
585 ASSERT_EQ(0u, db.GetUnprotectedPatientsCount(*manager)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
586 int64_t p1 = db.CreateResource(*manager, "patient1", OrthancPluginResourceType_Patient); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
587 int64_t p2 = db.CreateResource(*manager, "patient2", OrthancPluginResourceType_Patient); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
588 int64_t p3 = db.CreateResource(*manager, "patient3", OrthancPluginResourceType_Patient); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
589 ASSERT_EQ(3u, db.GetUnprotectedPatientsCount(*manager)); |
| 0 | 590 int64_t r; |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
591 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 592 ASSERT_EQ(p1, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
593 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p1)); |
| 0 | 594 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
595 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
596 db.SetProtectedPatient(*manager, p1, true); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
597 ASSERT_TRUE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
598 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 599 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
600 db.SetProtectedPatient(*manager, p1, false); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
601 ASSERT_FALSE(db.IsProtectedPatient(*manager, p1)); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
602 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager)); |
| 0 | 603 ASSERT_EQ(p2, r); |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
604 db.DeleteResource(*output, *manager, p2); |
|
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
605 ASSERT_TRUE(db.SelectPatientToRecycle(r, *manager, p3)); |
| 0 | 606 ASSERT_EQ(p1, r); |
|
225
94c9908e6aca
removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
221
diff
changeset
|
607 |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
608 { |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
609 // Test creating a large property of 16MB (large properties are |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
610 // notably necessary to serialize jobs) |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
611 // https://groups.google.com/g/orthanc-users/c/1Y3nTBdr0uE/m/K7PA5pboAgAJ |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
612 std::string longProperty; |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
613 longProperty.resize(16 * 1024 * 1024); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
614 for (size_t i = 0; i < longProperty.size(); i++) |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
615 { |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
616 longProperty[i] = 'A' + (i % 26); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
617 } |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
618 |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
619 db.SetGlobalProperty(*manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal8, longProperty.c_str()); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
620 |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
621 // The following line fails on MySQL 4.0 because the "value" |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
622 // column in "ServerProperties" is "TEXT" instead of "LONGTEXT" |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
623 db.SetGlobalProperty(*manager, "some-server", Orthanc::GlobalProperty_DatabaseInternal8, longProperty.c_str()); |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
624 |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
625 std::string tmp; |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
626 ASSERT_TRUE(db.LookupGlobalProperty(tmp, *manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseInternal8)); |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
627 ASSERT_EQ(longProperty, tmp); |
|
289
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
628 |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
629 tmp.clear(); |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
630 ASSERT_TRUE(db.LookupGlobalProperty(tmp, *manager, "some-server", Orthanc::GlobalProperty_DatabaseInternal8)); |
|
0868500060f3
Fix serialization of large jobs
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
288
diff
changeset
|
631 ASSERT_EQ(longProperty, tmp); |
|
288
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
632 } |
|
6d4d413a8797
unit test for large properties
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
273
diff
changeset
|
633 |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
634 db.DeleteResource(*output, *manager, p1); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
635 db.DeleteResource(*output, *manager, p3); |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
636 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
637 for (size_t level = 0; level < 4; level++) |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
638 { |
| 312 | 639 for (size_t attachmentLevel = 0; attachmentLevel < 4; attachmentLevel++) |
| 640 { | |
| 641 // Test cascade up to the "patient" level | |
| 642 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
643 |
| 312 | 644 std::vector<int64_t> resources; |
| 645 resources.push_back(db.CreateResource(*manager, "patient", OrthancPluginResourceType_Patient)); | |
| 646 resources.push_back(db.CreateResource(*manager, "study", OrthancPluginResourceType_Study)); | |
| 647 resources.push_back(db.CreateResource(*manager, "series", OrthancPluginResourceType_Series)); | |
| 648 resources.push_back(db.CreateResource(*manager, "instance", OrthancPluginResourceType_Instance)); | |
| 649 | |
| 321 | 650 OrthancPluginAttachment d; |
| 651 d.uuid = "attachment"; | |
| 652 d.contentType = Orthanc::FileContentType_DicomAsJson; | |
| 653 d.uncompressedSize = 4242; | |
| 654 d.uncompressedHash = "md5"; | |
| 655 d.compressionType = Orthanc::CompressionType_None; | |
| 656 d.compressedSize = 4242; | |
| 657 d.compressedHash = "md5"; | |
| 658 db.AddAttachment(*manager, resources[attachmentLevel], d, 42); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
659 |
| 312 | 660 db.AttachChild(*manager, resources[0], resources[1]); |
| 661 db.AttachChild(*manager, resources[1], resources[2]); | |
| 662 db.AttachChild(*manager, resources[2], resources[3]); | |
| 663 ASSERT_EQ(4u, db.GetAllResourcesCount(*manager)); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
664 |
| 312 | 665 deletedAttachments.clear(); |
| 666 deletedResources.clear(); | |
| 667 remainingAncestor.reset(); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
668 |
| 312 | 669 db.DeleteResource(*output, *manager, resources[level]); |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
670 |
| 312 | 671 ASSERT_EQ(1u, deletedAttachments.size()); |
| 672 ASSERT_EQ("attachment", *deletedAttachments.begin()); | |
| 673 ASSERT_EQ(4u, deletedResources.size()); | |
| 674 ASSERT_EQ(OrthancPluginResourceType_Patient, deletedResources["patient"]); | |
| 675 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); | |
| 676 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
| 677 ASSERT_EQ(OrthancPluginResourceType_Instance, deletedResources["instance"]); | |
| 678 ASSERT_TRUE(remainingAncestor.get() == NULL); | |
| 679 } | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
680 } |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
681 |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
682 for (size_t level = 1; level < 4; level++) |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
683 { |
| 312 | 684 for (size_t attachmentLevel = 0; attachmentLevel < 4; attachmentLevel++) |
| 685 { | |
| 686 // Test remaining ancestor | |
| 687 ASSERT_EQ(0u, db.GetAllResourcesCount(*manager)); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
688 |
| 312 | 689 std::vector<int64_t> resources; |
| 690 resources.push_back(db.CreateResource(*manager, "patient", OrthancPluginResourceType_Patient)); | |
| 691 resources.push_back(db.CreateResource(*manager, "study", OrthancPluginResourceType_Study)); | |
| 692 resources.push_back(db.CreateResource(*manager, "series", OrthancPluginResourceType_Series)); | |
| 693 resources.push_back(db.CreateResource(*manager, "instance", OrthancPluginResourceType_Instance)); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
694 |
| 312 | 695 int64_t unrelated = db.CreateResource(*manager, "unrelated", OrthancPluginResourceType_Patient); |
| 696 int64_t remaining = db.CreateResource(*manager, "remaining", static_cast<OrthancPluginResourceType>(level)); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
697 |
| 312 | 698 db.AttachChild(*manager, resources[0], resources[1]); |
| 699 db.AttachChild(*manager, resources[1], resources[2]); | |
| 700 db.AttachChild(*manager, resources[2], resources[3]); | |
| 701 db.AttachChild(*manager, resources[level - 1], remaining); | |
| 702 ASSERT_EQ(6u, db.GetAllResourcesCount(*manager)); | |
| 703 | |
| 321 | 704 OrthancPluginAttachment d; |
| 705 d.uuid = "attachment"; | |
| 706 d.contentType = Orthanc::FileContentType_DicomAsJson; | |
| 707 d.uncompressedSize = 4242; | |
| 708 d.uncompressedHash = "md5"; | |
| 709 d.compressionType = Orthanc::CompressionType_None; | |
| 710 d.compressedSize = 4242; | |
| 711 d.compressedHash = "md5"; | |
| 712 db.AddAttachment(*manager, resources[attachmentLevel], d, 42); | |
|
314
64763998cdff
clarification in IndexBackend::SignalDeletedFiles()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
313
diff
changeset
|
713 |
| 313 | 714 deletedAttachments.clear(); |
| 321 | 715 d.uuid = "attachment2"; |
| 313 | 716 db.DeleteAttachment(*output, *manager, resources[attachmentLevel], Orthanc::FileContentType_DicomAsJson); |
| 717 ASSERT_EQ(1u, deletedAttachments.size()); | |
| 718 ASSERT_EQ("attachment", *deletedAttachments.begin()); | |
| 719 | |
| 321 | 720 db.AddAttachment(*manager, resources[attachmentLevel], d, 43); |
| 313 | 721 |
| 312 | 722 deletedAttachments.clear(); |
| 723 deletedResources.clear(); | |
| 724 remainingAncestor.reset(); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
725 |
| 312 | 726 db.DeleteResource(*output, *manager, resources[3]); // delete instance |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
727 |
| 312 | 728 if (attachmentLevel < level) |
| 729 { | |
| 730 ASSERT_EQ(0u, deletedAttachments.size()); | |
| 731 } | |
| 732 else | |
| 733 { | |
| 734 ASSERT_EQ(1u, deletedAttachments.size()); | |
| 313 | 735 ASSERT_EQ("attachment2", *deletedAttachments.begin()); |
| 312 | 736 } |
| 737 | |
| 738 ASSERT_EQ(OrthancPluginResourceType_Instance, deletedResources["instance"]); | |
| 739 | |
| 740 ASSERT_TRUE(remainingAncestor.get() != NULL); | |
| 741 | |
| 742 switch (level) | |
| 743 { | |
| 744 case 1: | |
| 745 ASSERT_EQ(3u, deletedResources.size()); | |
| 746 ASSERT_EQ(OrthancPluginResourceType_Study, deletedResources["study"]); | |
| 747 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
| 748 ASSERT_EQ("patient", remainingAncestor->first); | |
| 749 ASSERT_EQ(OrthancPluginResourceType_Patient, remainingAncestor->second); | |
| 750 break; | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
751 |
| 312 | 752 case 2: |
| 753 ASSERT_EQ(2u, deletedResources.size()); | |
| 754 ASSERT_EQ(OrthancPluginResourceType_Series, deletedResources["series"]); | |
| 755 ASSERT_EQ("study", remainingAncestor->first); | |
| 756 ASSERT_EQ(OrthancPluginResourceType_Study, remainingAncestor->second); | |
| 757 break; | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
758 |
| 312 | 759 case 3: |
| 760 ASSERT_EQ(1u, deletedResources.size()); | |
| 761 ASSERT_EQ("series", remainingAncestor->first); | |
| 762 ASSERT_EQ(OrthancPluginResourceType_Series, remainingAncestor->second); | |
| 763 break; | |
| 764 | |
| 765 default: | |
| 766 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
| 767 } | |
| 768 | |
| 769 db.DeleteResource(*output, *manager, resources[0]); | |
| 770 db.DeleteResource(*output, *manager, unrelated); | |
|
307
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
771 } |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
772 } |
|
8de3a1ecac11
MySQL: Added missing calls to OrthancPluginDatabaseSignalDeletedResource()
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
301
diff
changeset
|
773 |
|
226
a4918d57435c
DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
225
diff
changeset
|
774 manager->Close(); |
| 0 | 775 } |