Mercurial > hg > orthanc-databases
annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 71:d40c5fecd160 db-changes
new extension implemented for PostgreSQL: CreateInstance
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 04 Jan 2019 13:51:52 +0100 |
parents | 714c5d2bee76 |
children | 8dd29af7c844 |
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 | |
67 | 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
0 | 6 * |
7 * This program is free software: you can redistribute it and/or | |
8 * modify it under the terms of the GNU Affero General Public License | |
9 * as published by the Free Software Foundation, either version 3 of | |
10 * the License, or (at your option) any later version. | |
11 * | |
12 * This program is distributed in the hope that it will be useful, but | |
13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Affero General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Affero General Public License | |
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
19 **/ | |
20 | |
21 | |
22 #include "PostgreSQLIndex.h" | |
23 | |
24 #include "../../Framework/Plugins/GlobalProperties.h" | |
25 #include "../../Framework/PostgreSQL/PostgreSQLDatabase.h" | |
26 #include "../../Framework/PostgreSQL/PostgreSQLTransaction.h" | |
27 | |
28 #include <EmbeddedResources.h> // Auto-generated file | |
29 | |
30 #include <Core/Logging.h> | |
31 #include <Core/OrthancException.h> | |
32 | |
33 | |
34 namespace Orthanc | |
35 { | |
36 // Some aliases for internal properties | |
37 static const GlobalProperty GlobalProperty_HasTrigramIndex = GlobalProperty_DatabaseInternal0; | |
71
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
38 static const GlobalProperty GlobalProperty_HasCreateInstance = GlobalProperty_DatabaseInternal1; |
0 | 39 } |
40 | |
41 | |
42 namespace OrthancDatabases | |
43 { | |
44 IDatabase* PostgreSQLIndex::OpenInternal() | |
45 { | |
46 uint32_t expectedVersion = 6; | |
47 if (context_) | |
48 { | |
49 expectedVersion = OrthancPluginGetExpectedDatabaseVersion(context_); | |
50 } | |
51 else | |
52 { | |
53 // This case only occurs during unit testing | |
54 expectedVersion = 6; | |
55 } | |
56 | |
57 // Check the expected version of the database | |
58 if (expectedVersion != 6) | |
59 { | |
60 LOG(ERROR) << "This database plugin is incompatible with your version of Orthanc " | |
61 << "expecting the DB schema version " << expectedVersion | |
62 << ", but this plugin is only compatible with version 6"; | |
63 throw Orthanc::OrthancException(Orthanc::ErrorCode_Plugin); | |
64 } | |
65 | |
66 std::auto_ptr<PostgreSQLDatabase> db(new PostgreSQLDatabase(parameters_)); | |
67 | |
68 db->Open(); | |
69 | |
12
41543239072d
transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
70 if (parameters_.HasLock()) |
41543239072d
transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
71 { |
41543239072d
transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
72 db->AdvisoryLock(42 /* some arbitrary constant */); |
41543239072d
transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
73 } |
41543239072d
transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
0
diff
changeset
|
74 |
0 | 75 if (clearAll_) |
76 { | |
77 db->ClearAll(); | |
78 } | |
79 | |
80 { | |
81 PostgreSQLTransaction t(*db); | |
82 | |
83 if (!db->DoesTableExist("Resources")) | |
84 { | |
85 std::string query; | |
86 | |
87 Orthanc::EmbeddedResources::GetFileResource | |
88 (query, Orthanc::EmbeddedResources::POSTGRESQL_PREPARE_INDEX); | |
89 db->Execute(query); | |
90 | |
91 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_DatabaseSchemaVersion, expectedVersion); | |
92 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_DatabasePatchLevel, 1); | |
93 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_HasTrigramIndex, 0); | |
94 } | |
95 | |
96 if (!db->DoesTableExist("Resources")) | |
97 { | |
98 LOG(ERROR) << "Corrupted PostgreSQL database"; | |
99 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); | |
100 } | |
101 | |
102 int version = 0; | |
103 if (!LookupGlobalIntegerProperty(version, *db, t, Orthanc::GlobalProperty_DatabaseSchemaVersion) || | |
104 version != 6) | |
105 { | |
106 LOG(ERROR) << "PostgreSQL plugin is incompatible with database schema version: " << version; | |
107 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database); | |
108 } | |
109 | |
110 int revision; | |
111 if (!LookupGlobalIntegerProperty(revision, *db, t, Orthanc::GlobalProperty_DatabasePatchLevel)) | |
112 { | |
113 revision = 1; | |
114 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_DatabasePatchLevel, revision); | |
115 } | |
116 | |
56
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
117 if (revision != 1) |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
118 { |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
119 LOG(ERROR) << "PostgreSQL plugin is incompatible with database schema revision: " << revision; |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
120 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database); |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
121 } |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
122 |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
123 t.Commit(); |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
124 } |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
125 |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
126 { |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
127 PostgreSQLTransaction t(*db); |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
128 |
0 | 129 int hasTrigram = 0; |
71
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
130 if (!LookupGlobalIntegerProperty(hasTrigram, *db, t, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
131 Orthanc::GlobalProperty_HasTrigramIndex) || |
0 | 132 hasTrigram != 1) |
133 { | |
13
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
134 /** |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
135 * Apply fix for performance issue (speed up wildcard search |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
136 * by using GIN trigrams). This implements the patch suggested |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
137 * in issue #47, BUT we also keep the original |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
138 * "DicomIdentifiersIndexValues", as it leads to better |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
139 * performance for "strict" searches (i.e. searches involving |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
140 * no wildcard). |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
141 * https://www.postgresql.org/docs/current/static/pgtrgm.html |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
142 * https://bitbucket.org/sjodogne/orthanc/issues/47/index-improvements-for-pg-plugin |
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
143 **/ |
0 | 144 try |
145 { | |
16
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
146 // We've observed 9 minutes on DB with 100000 studies |
20 | 147 LOG(WARNING) << "Trying to enable trigram matching on the PostgreSQL database " |
57
f4d5c2c70f98
Suggestion by Karsten Hilbert: CREATE EXTENSION IF NOT EXISTS pg_trgm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
56
diff
changeset
|
148 << "to speed up wildcard searches. This may take several minutes"; |
16
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
149 |
0 | 150 db->Execute( |
57
f4d5c2c70f98
Suggestion by Karsten Hilbert: CREATE EXTENSION IF NOT EXISTS pg_trgm
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
56
diff
changeset
|
151 "CREATE EXTENSION IF NOT EXISTS pg_trgm; " |
13
927264a0c137
preserve the original index
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
12
diff
changeset
|
152 "CREATE INDEX DicomIdentifiersIndexValues2 ON DicomIdentifiers USING gin(value gin_trgm_ops);"); |
0 | 153 |
154 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_HasTrigramIndex, 1); | |
19 | 155 LOG(WARNING) << "Trigram index has been created"; |
56
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
156 |
4f66bc893fc3
Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
20
diff
changeset
|
157 t.Commit(); |
0 | 158 } |
159 catch (Orthanc::OrthancException&) | |
160 { | |
16
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
161 LOG(WARNING) << "Performance warning: Your PostgreSQL server does " |
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
162 << "not support trigram matching"; |
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
163 LOG(WARNING) << "-> Consider installing the \"pg_trgm\" extension on the " |
9e419261f1c9
mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
15
diff
changeset
|
164 << "PostgreSQL server, e.g. on Debian: sudo apt install postgresql-contrib"; |
0 | 165 } |
166 } | |
167 } | |
168 | |
71
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
169 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
170 PostgreSQLTransaction t(*db); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
171 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
172 int hasCreateInstance = 0; |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
173 if (!LookupGlobalIntegerProperty(hasCreateInstance, *db, t, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
174 Orthanc::GlobalProperty_HasCreateInstance) || |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
175 hasCreateInstance != 1) |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
176 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
177 LOG(INFO) << "Installing the CreateInstance extension"; |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
178 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
179 std::string query; |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
180 Orthanc::EmbeddedResources::GetFileResource |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
181 (query, Orthanc::EmbeddedResources::POSTGRESQL_CREATE_INSTANCE); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
182 db->Execute(query); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
183 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
184 SetGlobalIntegerProperty(*db, t, Orthanc::GlobalProperty_HasCreateInstance, 1); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
185 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
186 t.Commit(); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
187 } |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
188 } |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
189 |
0 | 190 return db.release(); |
191 } | |
192 | |
193 | |
194 PostgreSQLIndex::PostgreSQLIndex(const PostgreSQLParameters& parameters) : | |
195 IndexBackend(new Factory(*this)), | |
196 context_(NULL), | |
197 parameters_(parameters), | |
198 clearAll_(false) | |
199 { | |
200 } | |
201 | |
202 | |
203 int64_t PostgreSQLIndex::CreateResource(const char* publicId, | |
204 OrthancPluginResourceType type) | |
205 { | |
206 DatabaseManager::CachedStatement statement( | |
207 STATEMENT_FROM_HERE, GetManager(), | |
208 "INSERT INTO Resources VALUES(${}, ${type}, ${id}, NULL) RETURNING internalId"); | |
209 | |
210 statement.SetParameterType("id", ValueType_Utf8String); | |
211 statement.SetParameterType("type", ValueType_Integer64); | |
212 | |
213 Dictionary args; | |
214 args.SetUtf8Value("id", publicId); | |
215 args.SetIntegerValue("type", static_cast<int>(type)); | |
216 | |
217 statement.Execute(args); | |
218 | |
219 return ReadInteger64(statement, 0); | |
220 } | |
71
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
221 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
222 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
223 void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
224 const char* hashPatient, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
225 const char* hashStudy, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
226 const char* hashSeries, |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
227 const char* hashInstance) |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
228 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
229 DatabaseManager::CachedStatement statement( |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
230 STATEMENT_FROM_HERE, GetManager(), |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
231 "SELECT * FROM CreateInstance(${patient}, ${study}, ${series}, ${instance})"); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
232 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
233 statement.SetParameterType("patient", ValueType_Utf8String); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
234 statement.SetParameterType("study", ValueType_Utf8String); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
235 statement.SetParameterType("series", ValueType_Utf8String); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
236 statement.SetParameterType("instance", ValueType_Utf8String); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
237 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
238 Dictionary args; |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
239 args.SetUtf8Value("patient", hashPatient); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
240 args.SetUtf8Value("study", hashStudy); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
241 args.SetUtf8Value("series", hashSeries); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
242 args.SetUtf8Value("instance", hashInstance); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
243 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
244 statement.Execute(args); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
245 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
246 if (statement.IsDone() || |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
247 statement.GetResultFieldsCount() != 8) |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
248 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
249 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
250 } |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
251 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
252 for (size_t i = 0; i < 8; i++) |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
253 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
254 statement.SetResultFieldType(i, ValueType_Integer64); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
255 } |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
256 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
257 result.isNewInstance = (ReadInteger64(statement, 3) == 1); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
258 result.instanceId = ReadInteger64(statement, 7); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
259 |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
260 if (result.isNewInstance) |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
261 { |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
262 result.isNewPatient = (ReadInteger64(statement, 0) == 1); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
263 result.isNewStudy = (ReadInteger64(statement, 1) == 1); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
264 result.isNewSeries = (ReadInteger64(statement, 2) == 1); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
265 result.patientId = ReadInteger64(statement, 4); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
266 result.studyId = ReadInteger64(statement, 5); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
267 result.seriesId = ReadInteger64(statement, 6); |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
268 } |
d40c5fecd160
new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
67
diff
changeset
|
269 } |
0 | 270 } |