Mercurial > hg > orthanc
annotate OrthancServer/DatabaseWrapper.cpp @ 1174:c200a92734c9 db-changes
integration mainline->db-changes
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 19 Sep 2014 18:24:34 +0200 |
| parents | 1ea4094d077c |
| children | 3b372ab992ec |
| rev | line source |
|---|---|
| 183 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 689 | 3 * Copyright (C) 2012-2014 Medical Physics Department, CHU of Liege, |
| 183 | 4 * Belgium |
| 5 * | |
| 6 * This program is free software: you can redistribute it and/or | |
| 7 * modify it under the terms of the GNU General Public License as | |
| 8 * published by the Free Software Foundation, either version 3 of the | |
| 9 * License, or (at your option) any later version. | |
| 10 * | |
| 11 * In addition, as a special exception, the copyright holders of this | |
| 12 * program give permission to link the code of its release with the | |
| 13 * OpenSSL project's "OpenSSL" library (or with modified versions of it | |
| 14 * that use the same license as the "OpenSSL" library), and distribute | |
| 15 * the linked executables. You must obey the GNU General Public License | |
| 16 * in all respects for all of the code used other than "OpenSSL". If you | |
| 17 * modify file(s) with this exception, you may extend this exception to | |
| 18 * your version of the file(s), but you are not obligated to do so. If | |
| 19 * you do not wish to do so, delete this exception statement from your | |
| 20 * version. If you delete this exception statement from all source files | |
| 21 * in the program, then also delete it here. | |
| 22 * | |
| 23 * This program is distributed in the hope that it will be useful, but | |
| 24 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 26 * General Public License for more details. | |
| 27 * | |
| 28 * You should have received a copy of the GNU General Public License | |
| 29 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 30 **/ | |
| 31 | |
| 32 | |
|
831
84513f2ee1f3
pch for unit tests and server
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
824
diff
changeset
|
33 #include "PrecompiledHeadersServer.h" |
| 183 | 34 #include "DatabaseWrapper.h" |
| 35 | |
| 36 #include "../Core/DicomFormat/DicomArray.h" | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
37 #include "../Core/Uuid.h" |
| 183 | 38 #include "EmbeddedResources.h" |
| 39 | |
| 40 #include <glog/logging.h> | |
| 41 #include <stdio.h> | |
| 42 | |
| 43 namespace Orthanc | |
| 44 { | |
| 45 | |
| 46 namespace Internals | |
| 47 { | |
| 48 class SignalFileDeleted : public SQLite::IScalarFunction | |
| 49 { | |
| 50 private: | |
| 51 IServerIndexListener& listener_; | |
| 52 | |
| 53 public: | |
| 54 SignalFileDeleted(IServerIndexListener& listener) : | |
| 55 listener_(listener) | |
| 56 { | |
| 57 } | |
| 58 | |
| 59 virtual const char* GetName() const | |
| 60 { | |
| 61 return "SignalFileDeleted"; | |
| 62 } | |
| 63 | |
| 64 virtual unsigned int GetCardinality() const | |
| 65 { | |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
66 return 7; |
| 183 | 67 } |
| 68 | |
| 69 virtual void Compute(SQLite::FunctionContext& context) | |
| 70 { | |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
71 std::string uncompressedMD5, compressedMD5; |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
72 |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
73 if (!context.IsNullValue(5)) |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
74 { |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
75 uncompressedMD5 = context.GetStringValue(5); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
76 } |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
77 |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
78 if (!context.IsNullValue(6)) |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
79 { |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
80 compressedMD5 = context.GetStringValue(6); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
81 } |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
82 |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
83 FileInfo info(context.GetStringValue(0), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
84 static_cast<FileContentType>(context.GetIntValue(1)), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
85 static_cast<uint64_t>(context.GetInt64Value(2)), |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
86 uncompressedMD5, |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
87 static_cast<CompressionType>(context.GetIntValue(3)), |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
88 static_cast<uint64_t>(context.GetInt64Value(4)), |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
89 compressedMD5); |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
90 |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
91 listener_.SignalFileDeleted(info); |
| 183 | 92 } |
| 93 }; | |
| 94 | |
| 1158 | 95 class SignalResourceDeleted : public SQLite::IScalarFunction |
| 96 { | |
| 97 private: | |
| 98 IServerIndexListener& listener_; | |
| 99 | |
| 100 public: | |
| 101 SignalResourceDeleted(IServerIndexListener& listener) : | |
| 102 listener_(listener) | |
| 103 { | |
| 104 } | |
| 105 | |
| 106 virtual const char* GetName() const | |
| 107 { | |
| 108 return "SignalResourceDeleted"; | |
| 109 } | |
| 110 | |
| 111 virtual unsigned int GetCardinality() const | |
| 112 { | |
| 113 return 2; | |
| 114 } | |
| 115 | |
| 116 virtual void Compute(SQLite::FunctionContext& context) | |
| 117 { | |
| 118 ResourceType type = static_cast<ResourceType>(context.GetIntValue(1)); | |
| 119 listener_.SignalResourceDeleted(type, context.GetStringValue(0)); | |
| 120 } | |
| 121 }; | |
| 122 | |
| 183 | 123 class SignalRemainingAncestor : public SQLite::IScalarFunction |
| 124 { | |
| 125 private: | |
| 126 bool hasRemainingAncestor_; | |
| 127 std::string remainingPublicId_; | |
| 128 ResourceType remainingType_; | |
| 129 | |
| 130 public: | |
| 660 | 131 SignalRemainingAncestor() : |
| 132 hasRemainingAncestor_(false) | |
| 133 { | |
| 134 } | |
| 135 | |
| 183 | 136 void Reset() |
| 137 { | |
| 138 hasRemainingAncestor_ = false; | |
| 139 } | |
| 140 | |
| 141 virtual const char* GetName() const | |
| 142 { | |
| 143 return "SignalRemainingAncestor"; | |
| 144 } | |
| 145 | |
| 146 virtual unsigned int GetCardinality() const | |
| 147 { | |
| 148 return 2; | |
| 149 } | |
| 150 | |
| 151 virtual void Compute(SQLite::FunctionContext& context) | |
| 152 { | |
| 153 VLOG(1) << "There exists a remaining ancestor with public ID \"" | |
| 154 << context.GetStringValue(0) | |
| 155 << "\" of type " | |
| 156 << context.GetIntValue(1); | |
| 157 | |
| 158 if (!hasRemainingAncestor_ || | |
| 159 remainingType_ >= context.GetIntValue(1)) | |
| 160 { | |
| 161 hasRemainingAncestor_ = true; | |
| 162 remainingPublicId_ = context.GetStringValue(0); | |
| 163 remainingType_ = static_cast<ResourceType>(context.GetIntValue(1)); | |
| 164 } | |
| 165 } | |
| 166 | |
| 167 bool HasRemainingAncestor() const | |
| 168 { | |
| 169 return hasRemainingAncestor_; | |
| 170 } | |
| 171 | |
| 172 const std::string& GetRemainingAncestorId() const | |
| 173 { | |
| 174 assert(hasRemainingAncestor_); | |
| 175 return remainingPublicId_; | |
| 176 } | |
| 177 | |
| 178 ResourceType GetRemainingAncestorType() const | |
| 179 { | |
| 180 assert(hasRemainingAncestor_); | |
| 181 return remainingType_; | |
| 182 } | |
| 183 }; | |
| 184 } | |
| 185 | |
| 186 | |
| 187 | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
188 void DatabaseWrapper::SetGlobalProperty(GlobalProperty property, |
| 183 | 189 const std::string& value) |
| 190 { | |
| 191 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR REPLACE INTO GlobalProperties VALUES(?, ?)"); | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
192 s.BindInt(0, property); |
| 183 | 193 s.BindString(1, value); |
| 194 s.Run(); | |
| 195 } | |
| 196 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
197 bool DatabaseWrapper::LookupGlobalProperty(std::string& target, |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
198 GlobalProperty property) |
| 183 | 199 { |
| 200 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
201 "SELECT value FROM GlobalProperties WHERE property=?"); |
|
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
202 s.BindInt(0, property); |
| 183 | 203 |
| 204 if (!s.Step()) | |
| 205 { | |
| 206 return false; | |
| 207 } | |
| 208 else | |
| 209 { | |
| 210 target = s.ColumnString(0); | |
| 211 return true; | |
| 212 } | |
| 213 } | |
| 214 | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
215 std::string DatabaseWrapper::GetGlobalProperty(GlobalProperty property, |
| 183 | 216 const std::string& defaultValue) |
| 217 { | |
| 218 std::string s; | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
219 if (LookupGlobalProperty(s, property)) |
| 183 | 220 { |
| 221 return s; | |
| 222 } | |
| 223 else | |
| 224 { | |
| 225 return defaultValue; | |
| 226 } | |
| 227 } | |
| 228 | |
| 229 int64_t DatabaseWrapper::CreateResource(const std::string& publicId, | |
| 230 ResourceType type) | |
| 231 { | |
| 232 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Resources VALUES(NULL, ?, ?, NULL)"); | |
| 233 s.BindInt(0, type); | |
| 234 s.BindString(1, publicId); | |
| 235 s.Run(); | |
|
189
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
236 int64_t id = db_.GetLastInsertRowId(); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
237 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
238 ChangeType changeType; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
239 switch (type) |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
240 { |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
241 case ResourceType_Patient: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
242 changeType = ChangeType_NewPatient; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
243 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
244 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
245 case ResourceType_Study: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
246 changeType = ChangeType_NewStudy; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
247 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
248 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
249 case ResourceType_Series: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
250 changeType = ChangeType_NewSeries; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
251 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
252 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
253 case ResourceType_Instance: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
254 changeType = ChangeType_NewInstance; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
255 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
256 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
257 default: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
258 throw OrthancException(ErrorCode_InternalError); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
259 } |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
260 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
261 LogChange(changeType, id, type); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
262 return id; |
| 183 | 263 } |
| 264 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
265 bool DatabaseWrapper::LookupResource(const std::string& publicId, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
266 int64_t& id, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
267 ResourceType& type) |
| 183 | 268 { |
| 269 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 270 "SELECT internalId, resourceType FROM Resources WHERE publicId=?"); | |
| 271 s.BindString(0, publicId); | |
| 272 | |
| 273 if (!s.Step()) | |
| 274 { | |
| 275 return false; | |
| 276 } | |
| 277 else | |
| 278 { | |
| 279 id = s.ColumnInt(0); | |
| 280 type = static_cast<ResourceType>(s.ColumnInt(1)); | |
| 281 | |
| 282 // Check whether there is a single resource with this public id | |
| 283 assert(!s.Step()); | |
| 284 | |
| 285 return true; | |
| 286 } | |
| 287 } | |
| 288 | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
289 bool DatabaseWrapper::LookupParent(int64_t& parentId, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
290 int64_t resourceId) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
291 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
292 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
293 "SELECT parentId FROM Resources WHERE internalId=?"); |
| 585 | 294 s.BindInt64(0, resourceId); |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
295 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
296 if (!s.Step()) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
297 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
298 throw OrthancException(ErrorCode_UnknownResource); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
299 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
300 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
301 if (s.ColumnIsNull(0)) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
302 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
303 return false; |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
304 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
305 else |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
306 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
307 parentId = s.ColumnInt(0); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
308 return true; |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
309 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
310 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
311 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
312 std::string DatabaseWrapper::GetPublicId(int64_t resourceId) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
313 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
314 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
315 "SELECT publicId FROM Resources WHERE internalId=?"); |
| 585 | 316 s.BindInt64(0, resourceId); |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
317 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
318 if (!s.Step()) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
319 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
320 throw OrthancException(ErrorCode_UnknownResource); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
321 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
322 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
323 return s.ColumnString(0); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
324 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
325 |
| 304 | 326 |
| 327 ResourceType DatabaseWrapper::GetResourceType(int64_t resourceId) | |
| 328 { | |
| 329 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 330 "SELECT resourceType FROM Resources WHERE internalId=?"); | |
| 585 | 331 s.BindInt64(0, resourceId); |
| 304 | 332 |
| 333 if (!s.Step()) | |
| 334 { | |
| 335 throw OrthancException(ErrorCode_UnknownResource); | |
| 336 } | |
| 337 | |
| 338 return static_cast<ResourceType>(s.ColumnInt(0)); | |
| 339 } | |
| 340 | |
| 341 | |
| 183 | 342 void DatabaseWrapper::AttachChild(int64_t parent, |
| 343 int64_t child) | |
| 344 { | |
| 345 SQLite::Statement s(db_, SQLITE_FROM_HERE, "UPDATE Resources SET parentId = ? WHERE internalId = ?"); | |
| 585 | 346 s.BindInt64(0, parent); |
| 347 s.BindInt64(1, child); | |
| 183 | 348 s.Run(); |
| 349 } | |
| 350 | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
351 void DatabaseWrapper::GetChildren(Json::Value& childrenPublicIds, |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
352 int64_t id) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
353 { |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
354 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE parentId=?"); |
| 585 | 355 s.BindInt64(0, id); |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
356 |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
357 childrenPublicIds = Json::arrayValue; |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
358 while (s.Step()) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
359 { |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
360 childrenPublicIds.append(s.ColumnString(0)); |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
361 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
362 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
363 |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
364 |
| 183 | 365 void DatabaseWrapper::DeleteResource(int64_t id) |
| 366 { | |
| 367 signalRemainingAncestor_->Reset(); | |
| 368 | |
| 369 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Resources WHERE internalId=?"); | |
| 585 | 370 s.BindInt64(0, id); |
| 183 | 371 s.Run(); |
| 372 | |
| 373 if (signalRemainingAncestor_->HasRemainingAncestor()) | |
| 374 { | |
| 375 listener_.SignalRemainingAncestor(signalRemainingAncestor_->GetRemainingAncestorType(), | |
| 376 signalRemainingAncestor_->GetRemainingAncestorId()); | |
| 377 } | |
| 378 } | |
| 379 | |
| 380 void DatabaseWrapper::SetMetadata(int64_t id, | |
| 381 MetadataType type, | |
| 382 const std::string& value) | |
| 383 { | |
| 384 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR REPLACE INTO Metadata VALUES(?, ?, ?)"); | |
| 585 | 385 s.BindInt64(0, id); |
| 183 | 386 s.BindInt(1, type); |
| 387 s.BindString(2, value); | |
| 388 s.Run(); | |
| 389 } | |
| 390 | |
| 438 | 391 void DatabaseWrapper::DeleteMetadata(int64_t id, |
| 392 MetadataType type) | |
| 393 { | |
| 394 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Metadata WHERE id=? and type=?"); | |
| 585 | 395 s.BindInt64(0, id); |
| 438 | 396 s.BindInt(1, type); |
| 397 s.Run(); | |
| 398 } | |
| 399 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
400 bool DatabaseWrapper::LookupMetadata(std::string& target, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
401 int64_t id, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
402 MetadataType type) |
| 183 | 403 { |
| 404 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 405 "SELECT value FROM Metadata WHERE id=? AND type=?"); | |
| 585 | 406 s.BindInt64(0, id); |
| 183 | 407 s.BindInt(1, type); |
| 408 | |
| 409 if (!s.Step()) | |
| 410 { | |
| 411 return false; | |
| 412 } | |
| 413 else | |
| 414 { | |
| 415 target = s.ColumnString(0); | |
| 416 return true; | |
| 417 } | |
| 418 } | |
| 419 | |
| 739 | 420 void DatabaseWrapper::ListAvailableMetadata(std::list<MetadataType>& target, |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
421 int64_t id) |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
422 { |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
423 target.clear(); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
424 |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
425 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT type FROM Metadata WHERE id=?"); |
| 585 | 426 s.BindInt64(0, id); |
|
436
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
427 |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
428 while (s.Step()) |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
429 { |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
430 target.push_back(static_cast<MetadataType>(s.ColumnInt(0))); |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
431 } |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
432 } |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
433 |
|
d51186bf7602
read access to metadata
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
434
diff
changeset
|
434 |
| 183 | 435 std::string DatabaseWrapper::GetMetadata(int64_t id, |
| 436 MetadataType type, | |
| 437 const std::string& defaultValue) | |
| 438 { | |
| 439 std::string s; | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
440 if (LookupMetadata(s, id, type)) |
| 183 | 441 { |
| 442 return s; | |
| 443 } | |
| 444 else | |
| 445 { | |
| 446 return defaultValue; | |
| 447 } | |
| 448 } | |
| 449 | |
|
200
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
450 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
451 bool DatabaseWrapper::GetMetadataAsInteger(int& result, |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
452 int64_t id, |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
453 MetadataType type) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
454 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
455 std::string s = GetMetadata(id, type, ""); |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
456 if (s.size() == 0) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
457 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
458 return false; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
459 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
460 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
461 try |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
462 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
463 result = boost::lexical_cast<int>(s); |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
464 return true; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
465 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
466 catch (boost::bad_lexical_cast&) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
467 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
468 return false; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
469 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
470 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
471 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
472 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
473 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
474 void DatabaseWrapper::AddAttachment(int64_t id, |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
475 const FileInfo& attachment) |
| 183 | 476 { |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
477 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO AttachedFiles VALUES(?, ?, ?, ?, ?, ?, ?, ?)"); |
| 585 | 478 s.BindInt64(0, id); |
| 233 | 479 s.BindInt(1, attachment.GetContentType()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
480 s.BindString(2, attachment.GetUuid()); |
| 585 | 481 s.BindInt64(3, attachment.GetCompressedSize()); |
| 482 s.BindInt64(4, attachment.GetUncompressedSize()); | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
483 s.BindInt(5, attachment.GetCompressionType()); |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
484 s.BindString(6, attachment.GetUncompressedMD5()); |
|
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
485 s.BindString(7, attachment.GetCompressedMD5()); |
| 183 | 486 s.Run(); |
| 487 } | |
| 488 | |
|
699
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
489 |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
490 void DatabaseWrapper::DeleteAttachment(int64_t id, |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
491 FileContentType attachment) |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
492 { |
| 701 | 493 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM AttachedFiles WHERE id=? AND fileType=?"); |
|
699
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
494 s.BindInt64(0, id); |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
495 s.BindInt(1, attachment); |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
496 s.Run(); |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
497 } |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
498 |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
499 |
|
2929e17f8447
add attachments to resources
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
694
diff
changeset
|
500 |
|
440
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
501 void DatabaseWrapper::ListAvailableAttachments(std::list<FileContentType>& result, |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
502 int64_t id) |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
503 { |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
504 result.clear(); |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
505 |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
506 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
507 "SELECT fileType FROM AttachedFiles WHERE id=?"); |
| 585 | 508 s.BindInt64(0, id); |
|
440
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
509 |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
510 while (s.Step()) |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
511 { |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
512 result.push_back(static_cast<FileContentType>(s.ColumnInt(0))); |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
513 } |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
514 } |
|
23e5b35e3c5c
statistics for patient/studies/series/instances
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
438
diff
changeset
|
515 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
516 bool DatabaseWrapper::LookupAttachment(FileInfo& attachment, |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
517 int64_t id, |
| 233 | 518 FileContentType contentType) |
| 183 | 519 { |
| 520 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
521 "SELECT uuid, uncompressedSize, compressionType, compressedSize, uncompressedMD5, compressedMD5 FROM AttachedFiles WHERE id=? AND fileType=?"); |
| 585 | 522 s.BindInt64(0, id); |
|
197
530a25320461
removal of text as ids in sqlite db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
193
diff
changeset
|
523 s.BindInt(1, contentType); |
| 183 | 524 |
| 525 if (!s.Step()) | |
| 526 { | |
| 527 return false; | |
| 528 } | |
| 529 else | |
| 530 { | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
531 attachment = FileInfo(s.ColumnString(0), |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
532 contentType, |
| 740 | 533 s.ColumnInt64(1), |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
534 s.ColumnString(4), |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
535 static_cast<CompressionType>(s.ColumnInt(2)), |
| 740 | 536 s.ColumnInt64(3), |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
537 s.ColumnString(5)); |
| 183 | 538 return true; |
| 539 } | |
| 540 } | |
| 541 | |
| 1162 | 542 |
| 543 static void SetMainDicomTagsInternal(SQLite::Statement& s, | |
| 544 int64_t id, | |
| 545 const DicomElement& element) | |
| 546 { | |
| 547 s.BindInt64(0, id); | |
| 548 s.BindInt(1, element.GetTag().GetGroup()); | |
| 549 s.BindInt(2, element.GetTag().GetElement()); | |
| 550 s.BindString(3, element.GetValue().AsString()); | |
| 551 s.Run(); | |
| 552 } | |
| 553 | |
| 554 | |
| 183 | 555 void DatabaseWrapper::SetMainDicomTags(int64_t id, |
| 556 const DicomMap& tags) | |
| 557 { | |
| 558 DicomArray flattened(tags); | |
| 559 for (size_t i = 0; i < flattened.GetSize(); i++) | |
| 560 { | |
| 1162 | 561 if (flattened.GetElement(i).GetTag().IsIdentifier()) |
| 562 { | |
| 563 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags VALUES(?, ?, ?, ?)"); | |
| 564 SetMainDicomTagsInternal(s, id, flattened.GetElement(i)); | |
| 565 } | |
| 566 else | |
| 567 { | |
| 568 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO DicomIdentifier VALUES(?, ?, ?, ?)"); | |
| 569 SetMainDicomTagsInternal(s, id, flattened.GetElement(i)); | |
| 570 } | |
| 183 | 571 } |
| 572 } | |
| 573 | |
| 574 void DatabaseWrapper::GetMainDicomTags(DicomMap& map, | |
| 575 int64_t id) | |
| 576 { | |
| 577 map.Clear(); | |
| 578 | |
| 579 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM MainDicomTags WHERE id=?"); | |
| 585 | 580 s.BindInt64(0, id); |
| 183 | 581 while (s.Step()) |
| 582 { | |
| 583 map.SetValue(s.ColumnInt(1), | |
| 584 s.ColumnInt(2), | |
| 585 s.ColumnString(3)); | |
| 586 } | |
| 1162 | 587 |
| 588 SQLite::Statement s2(db_, SQLITE_FROM_HERE, "SELECT * FROM DicomIdentifiers WHERE id=?"); | |
| 589 s2.BindInt64(0, id); | |
| 590 while (s2.Step()) | |
| 591 { | |
| 592 map.SetValue(s2.ColumnInt(1), | |
| 593 s2.ColumnInt(2), | |
| 594 s2.ColumnString(3)); | |
| 595 } | |
| 183 | 596 } |
| 597 | |
| 598 | |
| 599 bool DatabaseWrapper::GetParentPublicId(std::string& result, | |
| 600 int64_t id) | |
| 601 { | |
| 602 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b " | |
| 603 "WHERE a.internalId = b.parentId AND b.internalId = ?"); | |
| 585 | 604 s.BindInt64(0, id); |
| 183 | 605 |
| 606 if (s.Step()) | |
| 607 { | |
| 608 result = s.ColumnString(0); | |
| 609 return true; | |
| 610 } | |
| 611 else | |
| 612 { | |
| 613 return false; | |
| 614 } | |
| 615 } | |
| 616 | |
| 617 | |
| 618 void DatabaseWrapper::GetChildrenPublicId(std::list<std::string>& result, | |
| 619 int64_t id) | |
| 620 { | |
| 621 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b " | |
| 622 "WHERE a.parentId = b.internalId AND b.internalId = ?"); | |
| 585 | 623 s.BindInt64(0, id); |
| 183 | 624 |
| 625 result.clear(); | |
| 626 | |
| 627 while (s.Step()) | |
| 628 { | |
| 629 result.push_back(s.ColumnString(0)); | |
| 630 } | |
| 631 } | |
| 632 | |
| 633 | |
| 199 | 634 void DatabaseWrapper::GetChildrenInternalId(std::list<int64_t>& result, |
| 635 int64_t id) | |
| 636 { | |
| 637 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.internalId FROM Resources AS a, Resources AS b " | |
| 638 "WHERE a.parentId = b.internalId AND b.internalId = ?"); | |
| 585 | 639 s.BindInt64(0, id); |
| 199 | 640 |
| 641 result.clear(); | |
| 642 | |
| 643 while (s.Step()) | |
| 644 { | |
| 741 | 645 result.push_back(s.ColumnInt64(0)); |
| 199 | 646 } |
| 647 } | |
| 648 | |
| 649 | |
| 183 | 650 void DatabaseWrapper::LogChange(ChangeType changeType, |
|
189
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
651 int64_t internalId, |
| 183 | 652 ResourceType resourceType, |
| 653 const boost::posix_time::ptime& date) | |
| 654 { | |
| 655 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Changes VALUES(NULL, ?, ?, ?, ?)"); | |
| 656 s.BindInt(0, changeType); | |
| 585 | 657 s.BindInt64(1, internalId); |
| 183 | 658 s.BindInt(2, resourceType); |
| 659 s.BindString(3, boost::posix_time::to_iso_string(date)); | |
| 660 s.Run(); | |
| 661 } | |
| 662 | |
| 663 | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
664 void DatabaseWrapper::GetChangesInternal(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
665 SQLite::Statement& s, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
666 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
667 unsigned int maxResults) |
| 204 | 668 { |
| 669 Json::Value changes = Json::arrayValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
670 int64_t last = since; |
| 204 | 671 |
| 672 while (changes.size() < maxResults && s.Step()) | |
| 673 { | |
| 742 | 674 int64_t seq = s.ColumnInt64(0); |
| 204 | 675 ChangeType changeType = static_cast<ChangeType>(s.ColumnInt(1)); |
| 742 | 676 int64_t internalId = s.ColumnInt64(2); |
| 204 | 677 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(3)); |
| 678 const std::string& date = s.ColumnString(4); | |
|
205
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
679 std::string publicId = GetPublicId(internalId); |
| 204 | 680 |
| 681 Json::Value item = Json::objectValue; | |
| 682 item["Seq"] = static_cast<int>(seq); | |
|
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
683 item["ChangeType"] = EnumerationToString(changeType); |
|
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
684 item["ResourceType"] = EnumerationToString(resourceType); |
|
205
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
685 item["ID"] = publicId; |
|
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
686 item["Path"] = GetBasePath(resourceType, publicId); |
| 204 | 687 item["Date"] = date; |
| 688 last = seq; | |
| 689 | |
| 690 changes.append(item); | |
| 691 } | |
| 692 | |
| 693 target = Json::objectValue; | |
| 694 target["Changes"] = changes; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
695 target["Done"] = !(changes.size() == maxResults && s.Step()); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
696 target["Last"] = static_cast<int>(last); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
697 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
698 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
699 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
700 void DatabaseWrapper::GetChanges(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
701 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
702 unsigned int maxResults) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
703 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
704 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM Changes WHERE seq>? ORDER BY seq LIMIT ?"); |
| 585 | 705 s.BindInt64(0, since); |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
706 s.BindInt(1, maxResults + 1); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
707 GetChangesInternal(target, s, since, maxResults); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
708 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
709 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
710 void DatabaseWrapper::GetLastChange(Json::Value& target) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
711 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
712 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM Changes ORDER BY seq DESC LIMIT 1"); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
713 GetChangesInternal(target, s, 0, 1); |
| 204 | 714 } |
| 715 | |
| 716 | |
| 231 | 717 void DatabaseWrapper::LogExportedResource(ResourceType resourceType, |
| 718 const std::string& publicId, | |
| 719 const std::string& remoteModality, | |
| 720 const std::string& patientId, | |
| 721 const std::string& studyInstanceUid, | |
| 722 const std::string& seriesInstanceUid, | |
| 723 const std::string& sopInstanceUid, | |
| 183 | 724 const boost::posix_time::ptime& date) |
| 725 { | |
| 231 | 726 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
| 727 "INSERT INTO ExportedResources VALUES(NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); | |
| 728 | |
| 729 s.BindInt(0, resourceType); | |
| 730 s.BindString(1, publicId); | |
| 731 s.BindString(2, remoteModality); | |
| 732 s.BindString(3, patientId); | |
| 733 s.BindString(4, studyInstanceUid); | |
| 734 s.BindString(5, seriesInstanceUid); | |
| 735 s.BindString(6, sopInstanceUid); | |
| 736 s.BindString(7, boost::posix_time::to_iso_string(date)); | |
| 737 | |
| 183 | 738 s.Run(); |
| 739 } | |
| 231 | 740 |
| 741 | |
| 742 | 742 void DatabaseWrapper::GetExportedResourcesInternal(Json::Value& target, |
| 743 SQLite::Statement& s, | |
| 744 int64_t since, | |
| 745 unsigned int maxResults) | |
| 231 | 746 { |
| 747 Json::Value changes = Json::arrayValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
748 int64_t last = since; |
| 231 | 749 |
| 750 while (changes.size() < maxResults && s.Step()) | |
| 751 { | |
| 743 | 752 int64_t seq = s.ColumnInt64(0); |
| 231 | 753 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1)); |
| 754 std::string publicId = s.ColumnString(2); | |
| 755 | |
| 756 Json::Value item = Json::objectValue; | |
| 757 item["Seq"] = static_cast<int>(seq); | |
|
434
ccf3a0a43dac
EnumerationDictionary
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
413
diff
changeset
|
758 item["ResourceType"] = EnumerationToString(resourceType); |
| 231 | 759 item["ID"] = publicId; |
| 760 item["Path"] = GetBasePath(resourceType, publicId); | |
| 761 item["RemoteModality"] = s.ColumnString(3); | |
| 762 item["Date"] = s.ColumnString(8); | |
| 763 | |
| 764 // WARNING: Do not add "break" below and do not reorder the case items! | |
| 765 switch (resourceType) | |
| 766 { | |
| 767 case ResourceType_Instance: | |
| 768 item["SopInstanceUid"] = s.ColumnString(7); | |
| 769 | |
| 770 case ResourceType_Series: | |
| 771 item["SeriesInstanceUid"] = s.ColumnString(6); | |
| 772 | |
| 773 case ResourceType_Study: | |
| 774 item["StudyInstanceUid"] = s.ColumnString(5); | |
| 775 | |
| 776 case ResourceType_Patient: | |
| 777 item["PatientId"] = s.ColumnString(4); | |
| 778 break; | |
| 779 | |
| 780 default: | |
| 781 throw OrthancException(ErrorCode_InternalError); | |
| 782 } | |
| 783 | |
| 784 last = seq; | |
| 785 | |
| 786 changes.append(item); | |
| 787 } | |
| 788 | |
| 789 target = Json::objectValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
790 target["Exports"] = changes; |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
791 target["Done"] = !(changes.size() == maxResults && s.Step()); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
792 target["Last"] = static_cast<int>(last); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
793 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
794 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
795 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
796 void DatabaseWrapper::GetExportedResources(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
797 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
798 unsigned int maxResults) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
799 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
800 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
801 "SELECT * FROM ExportedResources WHERE seq>? ORDER BY seq LIMIT ?"); |
| 585 | 802 s.BindInt64(0, since); |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
803 s.BindInt(1, maxResults + 1); |
| 742 | 804 GetExportedResourcesInternal(target, s, since, maxResults); |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
805 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
806 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
807 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
808 void DatabaseWrapper::GetLastExportedResource(Json::Value& target) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
809 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
810 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
811 "SELECT * FROM ExportedResources ORDER BY seq DESC LIMIT 1"); |
| 742 | 812 GetExportedResourcesInternal(target, s, 0, 1); |
| 231 | 813 } |
| 814 | |
| 815 | |
| 183 | 816 |
| 817 | |
| 818 int64_t DatabaseWrapper::GetTableRecordCount(const std::string& table) | |
| 819 { | |
| 820 char buf[128]; | |
| 821 sprintf(buf, "SELECT COUNT(*) FROM %s", table.c_str()); | |
| 822 SQLite::Statement s(db_, buf); | |
| 823 | |
| 218 | 824 if (!s.Step()) |
| 825 { | |
| 826 throw OrthancException(ErrorCode_InternalError); | |
| 827 } | |
| 828 | |
| 183 | 829 int64_t c = s.ColumnInt(0); |
| 830 assert(!s.Step()); | |
| 831 | |
| 832 return c; | |
| 833 } | |
| 834 | |
| 835 | |
| 836 uint64_t DatabaseWrapper::GetTotalCompressedSize() | |
| 837 { | |
| 838 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(compressedSize) FROM AttachedFiles"); | |
| 839 s.Run(); | |
| 840 return static_cast<uint64_t>(s.ColumnInt64(0)); | |
| 841 } | |
| 842 | |
| 843 | |
| 844 uint64_t DatabaseWrapper::GetTotalUncompressedSize() | |
| 845 { | |
| 846 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(uncompressedSize) FROM AttachedFiles"); | |
| 847 s.Run(); | |
| 848 return static_cast<uint64_t>(s.ColumnInt64(0)); | |
| 849 } | |
| 850 | |
| 190 | 851 void DatabaseWrapper::GetAllPublicIds(Json::Value& target, |
| 852 ResourceType resourceType) | |
| 853 { | |
| 854 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE resourceType=?"); | |
| 855 s.BindInt(0, resourceType); | |
| 856 | |
| 857 target = Json::arrayValue; | |
| 858 while (s.Step()) | |
| 859 { | |
| 860 target.append(s.ColumnString(0)); | |
| 861 } | |
| 862 } | |
| 863 | |
| 183 | 864 |
| 865 DatabaseWrapper::DatabaseWrapper(const std::string& path, | |
| 866 IServerIndexListener& listener) : | |
| 867 listener_(listener) | |
| 868 { | |
| 869 db_.Open(path); | |
| 870 Open(); | |
| 871 } | |
| 872 | |
| 873 DatabaseWrapper::DatabaseWrapper(IServerIndexListener& listener) : | |
| 874 listener_(listener) | |
| 875 { | |
| 876 db_.OpenInMemory(); | |
| 877 Open(); | |
| 878 } | |
| 879 | |
| 880 void DatabaseWrapper::Open() | |
| 881 { | |
| 374 | 882 // Performance tuning of SQLite with PRAGMAs |
| 883 // http://www.sqlite.org/pragma.html | |
| 884 db_.Execute("PRAGMA SYNCHRONOUS=NORMAL;"); | |
| 885 db_.Execute("PRAGMA JOURNAL_MODE=WAL;"); | |
| 886 db_.Execute("PRAGMA LOCKING_MODE=EXCLUSIVE;"); | |
| 887 db_.Execute("PRAGMA WAL_AUTOCHECKPOINT=1000;"); | |
| 888 //db_.Execute("PRAGMA TEMP_STORE=memory"); | |
| 889 | |
| 183 | 890 if (!db_.DoesTableExist("GlobalProperties")) |
| 891 { | |
| 892 LOG(INFO) << "Creating the database"; | |
| 893 std::string query; | |
|
203
9283552c25df
db refactoring done
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
894 EmbeddedResources::GetFileResource(query, EmbeddedResources::PREPARE_DATABASE); |
| 183 | 895 db_.Execute(query); |
| 896 } | |
| 897 | |
| 567 | 898 // Check the version of the database |
| 252 | 899 std::string version = GetGlobalProperty(GlobalProperty_DatabaseSchemaVersion, "Unknown"); |
| 900 bool ok = false; | |
| 901 try | |
| 902 { | |
| 903 LOG(INFO) << "Version of the Orthanc database: " << version; | |
| 904 unsigned int v = boost::lexical_cast<unsigned int>(version); | |
| 905 | |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
906 /** |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
907 * History of the database versions: |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
908 * - Version 3: from Orthanc 0.3.2 to Orthanc 0.7.2 (inclusive) |
| 1158 | 909 * - Version 4: from Orthanc 0.7.3 to Orthanc 0.8.3 (inclusive) |
| 910 * - Version 5: from Orthanc 0.8.4 (inclusive) | |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
911 **/ |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
912 |
| 1158 | 913 // This version of Orthanc is only compatible with versions 3, 4 and 5 of the DB schema |
| 914 ok = (v == 3 || v == 4 || v == 5); | |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
915 |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
916 if (v == 3) |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
917 { |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
918 LOG(WARNING) << "Upgrading database version from 3 to 4"; |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
919 std::string upgrade; |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
920 EmbeddedResources::GetFileResource(upgrade, EmbeddedResources::UPGRADE_DATABASE_3_TO_4); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
921 db_.BeginTransaction(); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
922 db_.Execute(upgrade); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
923 db_.CommitTransaction(); |
| 1158 | 924 v = 4; |
| 925 } | |
| 926 | |
| 927 if (v == 4) | |
| 928 { | |
| 929 LOG(WARNING) << "Upgrading database version from 4 to 5"; | |
| 930 std::string upgrade; | |
| 931 EmbeddedResources::GetFileResource(upgrade, EmbeddedResources::UPGRADE_DATABASE_4_TO_5); | |
| 932 db_.BeginTransaction(); | |
| 933 db_.Execute(upgrade); | |
| 934 db_.CommitTransaction(); | |
| 935 v = 5; | |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
936 } |
| 252 | 937 } |
| 938 catch (boost::bad_lexical_cast&) | |
| 939 { | |
| 940 } | |
| 941 | |
| 942 if (!ok) | |
| 943 { | |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
944 LOG(ERROR) << "Incompatible version of the Orthanc database: " << version; |
| 252 | 945 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
| 946 } | |
| 947 | |
| 183 | 948 signalRemainingAncestor_ = new Internals::SignalRemainingAncestor; |
| 949 db_.Register(signalRemainingAncestor_); | |
| 950 db_.Register(new Internals::SignalFileDeleted(listener_)); | |
| 1158 | 951 db_.Register(new Internals::SignalResourceDeleted(listener_)); |
| 183 | 952 } |
| 238 | 953 |
| 954 uint64_t DatabaseWrapper::GetResourceCount(ResourceType resourceType) | |
| 955 { | |
| 956 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 957 "SELECT COUNT(*) FROM Resources WHERE resourceType=?"); | |
| 958 s.BindInt(0, resourceType); | |
| 959 | |
| 960 if (!s.Step()) | |
| 961 { | |
| 962 throw OrthancException(ErrorCode_InternalError); | |
| 963 } | |
| 964 | |
| 965 int64_t c = s.ColumnInt(0); | |
| 966 assert(!s.Step()); | |
| 967 | |
| 968 return c; | |
| 969 } | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
970 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
971 bool DatabaseWrapper::SelectPatientToRecycle(int64_t& internalId) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
972 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
973 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
974 "SELECT patientId FROM PatientRecyclingOrder ORDER BY seq ASC LIMIT 1"); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
975 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
976 if (!s.Step()) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
977 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
978 // No patient remaining or all the patients are protected |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
979 return false; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
980 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
981 else |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
982 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
983 internalId = s.ColumnInt(0); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
984 return true; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
985 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
986 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
987 |
|
268
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
988 bool DatabaseWrapper::SelectPatientToRecycle(int64_t& internalId, |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
989 int64_t patientIdToAvoid) |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
990 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
991 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
992 "SELECT patientId FROM PatientRecyclingOrder " |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
993 "WHERE patientId != ? ORDER BY seq ASC LIMIT 1"); |
| 585 | 994 s.BindInt64(0, patientIdToAvoid); |
|
268
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
995 |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
996 if (!s.Step()) |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
997 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
998 // No patient remaining or all the patients are protected |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
999 return false; |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1000 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1001 else |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1002 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1003 internalId = s.ColumnInt(0); |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1004 return true; |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1005 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1006 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
1007 |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1008 bool DatabaseWrapper::IsProtectedPatient(int64_t internalId) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1009 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1010 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1011 "SELECT * FROM PatientRecyclingOrder WHERE patientId = ?"); |
| 585 | 1012 s.BindInt64(0, internalId); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1013 return !s.Step(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1014 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1015 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1016 void DatabaseWrapper::SetProtectedPatient(int64_t internalId, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1017 bool isProtected) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1018 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1019 if (isProtected) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1020 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1021 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM PatientRecyclingOrder WHERE patientId=?"); |
| 585 | 1022 s.BindInt64(0, internalId); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1023 s.Run(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1024 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1025 else if (IsProtectedPatient(internalId)) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1026 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1027 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO PatientRecyclingOrder VALUES(NULL, ?)"); |
| 585 | 1028 s.BindInt64(0, internalId); |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1029 s.Run(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1030 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1031 else |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1032 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1033 // Nothing to do: The patient is already unprotected |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1034 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
1035 } |
| 310 | 1036 |
| 1037 | |
| 1038 uint64_t DatabaseWrapper::IncrementGlobalSequence(GlobalProperty property) | |
| 1039 { | |
| 1040 std::string oldValue; | |
| 1041 | |
| 1042 if (LookupGlobalProperty(oldValue, property)) | |
| 1043 { | |
| 1044 uint64_t oldNumber; | |
| 1045 | |
| 1046 try | |
| 1047 { | |
| 1048 oldNumber = boost::lexical_cast<uint64_t>(oldValue); | |
| 1049 SetGlobalProperty(property, boost::lexical_cast<std::string>(oldNumber + 1)); | |
| 1050 return oldNumber + 1; | |
| 1051 } | |
| 1052 catch (boost::bad_lexical_cast&) | |
| 1053 { | |
| 1054 throw OrthancException(ErrorCode_InternalError); | |
| 1055 } | |
| 1056 } | |
| 1057 else | |
| 1058 { | |
| 1059 // Initialize the sequence at "1" | |
| 1060 SetGlobalProperty(property, "1"); | |
| 1061 return 1; | |
| 1062 } | |
| 1063 } | |
|
413
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1064 |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1065 |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1066 void DatabaseWrapper::ClearTable(const std::string& tableName) |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1067 { |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1068 db_.Execute("DELETE FROM " + tableName); |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
1069 } |
| 513 | 1070 |
| 1071 | |
| 1072 bool DatabaseWrapper::IsExistingResource(int64_t internalId) | |
| 1073 { | |
| 1074 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 1075 "SELECT * FROM Resources WHERE internalId=?"); | |
| 585 | 1076 s.BindInt64(0, internalId); |
| 513 | 1077 return s.Step(); |
| 1078 } | |
| 521 | 1079 |
| 1080 | |
| 1162 | 1081 void DatabaseWrapper::LookupIdentifier(std::list<int64_t>& result, |
| 1082 const DicomTag& tag, | |
| 1083 const std::string& value) | |
| 521 | 1084 { |
| 1162 | 1085 if (!tag.IsIdentifier()) |
| 1086 { | |
| 1087 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 1088 } | |
| 1089 | |
| 521 | 1090 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
| 1162 | 1091 "SELECT id FROM DicomIdentifiers WHERE tagGroup=? AND tagElement=? and value=?"); |
| 521 | 1092 |
| 1093 s.BindInt(0, tag.GetGroup()); | |
| 1094 s.BindInt(1, tag.GetElement()); | |
| 1095 s.BindString(2, value); | |
| 1096 | |
| 1097 result.clear(); | |
| 1098 | |
| 1099 while (s.Step()) | |
| 1100 { | |
| 1101 result.push_back(s.ColumnInt64(0)); | |
| 1102 } | |
| 1103 } | |
| 1104 | |
| 1105 | |
| 1162 | 1106 void DatabaseWrapper::LookupIdentifier(std::list<int64_t>& result, |
| 1107 const std::string& value) | |
| 521 | 1108 { |
| 1109 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 1162 | 1110 "SELECT id FROM DicomIdentifiers WHERE value=?"); |
| 521 | 1111 |
| 1112 s.BindString(0, value); | |
| 1113 | |
| 1114 result.clear(); | |
| 1115 | |
| 1116 while (s.Step()) | |
| 1117 { | |
| 1118 result.push_back(s.ColumnInt64(0)); | |
| 1119 } | |
| 1120 } | |
|
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1121 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1122 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1123 void DatabaseWrapper::GetAllMetadata(std::map<MetadataType, std::string>& result, |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1124 int64_t id) |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1125 { |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1126 result.clear(); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1127 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1128 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT type, value FROM Metadata WHERE id=?"); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1129 s.BindInt64(0, id); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1130 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1131 while (s.Step()) |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1132 { |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1133 MetadataType key = static_cast<MetadataType>(s.ColumnInt(0)); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1134 result[key] = s.ColumnString(1); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1135 } |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1136 } |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
1137 |
| 183 | 1138 } |