Mercurial > hg > orthanc
annotate OrthancServer/DatabaseWrapper.cpp @ 2142:5a8840920121
reorganization
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 09 Nov 2016 16:26:40 +0100 |
| parents | 4b02ec79728a |
| children | a3a65de1840f |
| rev | line source |
|---|---|
| 183 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 1900 | 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
|
1288
6e7e5ed91c2d
upgrade to year 2015
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1286
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
| 183 | 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" | |
|
1486
f967bdf8534e
refactoring to Logging.h
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1432
diff
changeset
|
37 #include "../Core/Logging.h" |
| 183 | 38 #include "EmbeddedResources.h" |
|
1669
a412ad57f0f9
refactoring of sample plugins, OrthancPluginReconstructMainDicomTags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1668
diff
changeset
|
39 #include "ServerToolbox.h" |
| 183 | 40 |
| 41 #include <stdio.h> | |
| 1247 | 42 #include <boost/lexical_cast.hpp> |
| 183 | 43 |
| 44 namespace Orthanc | |
| 45 { | |
| 46 | |
| 47 namespace Internals | |
| 48 { | |
| 49 class SignalFileDeleted : public SQLite::IScalarFunction | |
| 50 { | |
| 51 private: | |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1407
diff
changeset
|
52 IDatabaseListener& listener_; |
| 183 | 53 |
| 54 public: | |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1407
diff
changeset
|
55 SignalFileDeleted(IDatabaseListener& listener) : |
| 183 | 56 listener_(listener) |
| 57 { | |
| 58 } | |
| 59 | |
| 60 virtual const char* GetName() const | |
| 61 { | |
| 62 return "SignalFileDeleted"; | |
| 63 } | |
| 64 | |
| 65 virtual unsigned int GetCardinality() const | |
| 66 { | |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
67 return 7; |
| 183 | 68 } |
| 69 | |
| 70 virtual void Compute(SQLite::FunctionContext& context) | |
| 71 { | |
|
694
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
72 std::string uncompressedMD5, compressedMD5; |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
73 |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
74 if (!context.IsNullValue(5)) |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
75 { |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
76 uncompressedMD5 = context.GetStringValue(5); |
|
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 |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
79 if (!context.IsNullValue(6)) |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
80 { |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
81 compressedMD5 = context.GetStringValue(6); |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
82 } |
|
72dc919a028c
upgrade database from v3 to v4
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
693
diff
changeset
|
83 |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
84 FileInfo info(context.GetStringValue(0), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
85 static_cast<FileContentType>(context.GetIntValue(1)), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
86 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
|
87 uncompressedMD5, |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
88 static_cast<CompressionType>(context.GetIntValue(3)), |
|
693
01d8611c4a60
md5 for attached files
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
689
diff
changeset
|
89 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
|
90 compressedMD5); |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
91 |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
92 listener_.SignalFileDeleted(info); |
| 183 | 93 } |
| 94 }; | |
| 95 | |
| 1158 | 96 class SignalResourceDeleted : public SQLite::IScalarFunction |
| 97 { | |
| 98 private: | |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1407
diff
changeset
|
99 IDatabaseListener& listener_; |
| 1158 | 100 |
| 101 public: | |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1407
diff
changeset
|
102 SignalResourceDeleted(IDatabaseListener& listener) : |
| 1158 | 103 listener_(listener) |
| 104 { | |
| 105 } | |
| 106 | |
| 107 virtual const char* GetName() const | |
| 108 { | |
| 109 return "SignalResourceDeleted"; | |
| 110 } | |
| 111 | |
| 112 virtual unsigned int GetCardinality() const | |
| 113 { | |
| 114 return 2; | |
| 115 } | |
| 116 | |
| 117 virtual void Compute(SQLite::FunctionContext& context) | |
| 118 { | |
| 119 ResourceType type = static_cast<ResourceType>(context.GetIntValue(1)); | |
| 1198 | 120 ServerIndexChange change(ChangeType_Deleted, type, context.GetStringValue(0)); |
| 121 listener_.SignalChange(change); | |
| 1158 | 122 } |
| 123 }; | |
| 124 | |
| 183 | 125 class SignalRemainingAncestor : public SQLite::IScalarFunction |
| 126 { | |
| 127 private: | |
| 128 bool hasRemainingAncestor_; | |
| 129 std::string remainingPublicId_; | |
| 130 ResourceType remainingType_; | |
| 131 | |
| 132 public: | |
| 660 | 133 SignalRemainingAncestor() : |
| 134 hasRemainingAncestor_(false) | |
| 135 { | |
| 136 } | |
| 137 | |
| 183 | 138 void Reset() |
| 139 { | |
| 140 hasRemainingAncestor_ = false; | |
| 141 } | |
| 142 | |
| 143 virtual const char* GetName() const | |
| 144 { | |
| 145 return "SignalRemainingAncestor"; | |
| 146 } | |
| 147 | |
| 148 virtual unsigned int GetCardinality() const | |
| 149 { | |
| 150 return 2; | |
| 151 } | |
| 152 | |
| 153 virtual void Compute(SQLite::FunctionContext& context) | |
| 154 { | |
| 155 VLOG(1) << "There exists a remaining ancestor with public ID \"" | |
| 156 << context.GetStringValue(0) | |
| 157 << "\" of type " | |
| 158 << context.GetIntValue(1); | |
| 159 | |
| 160 if (!hasRemainingAncestor_ || | |
| 161 remainingType_ >= context.GetIntValue(1)) | |
| 162 { | |
| 163 hasRemainingAncestor_ = true; | |
| 164 remainingPublicId_ = context.GetStringValue(0); | |
| 165 remainingType_ = static_cast<ResourceType>(context.GetIntValue(1)); | |
| 166 } | |
| 167 } | |
| 168 | |
| 169 bool HasRemainingAncestor() const | |
| 170 { | |
| 171 return hasRemainingAncestor_; | |
| 172 } | |
| 173 | |
| 174 const std::string& GetRemainingAncestorId() const | |
| 175 { | |
| 176 assert(hasRemainingAncestor_); | |
| 177 return remainingPublicId_; | |
| 178 } | |
| 179 | |
| 180 ResourceType GetRemainingAncestorType() const | |
| 181 { | |
| 182 assert(hasRemainingAncestor_); | |
| 183 return remainingType_; | |
| 184 } | |
| 185 }; | |
| 186 } | |
| 187 | |
| 188 | |
| 1241 | 189 |
| 190 void DatabaseWrapper::GetChildren(std::list<std::string>& childrenPublicIds, | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
191 int64_t id) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
192 { |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
193 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE parentId=?"); |
| 585 | 194 s.BindInt64(0, id); |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
195 |
| 1241 | 196 childrenPublicIds.clear(); |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
197 while (s.Step()) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
198 { |
| 1241 | 199 childrenPublicIds.push_back(s.ColumnString(0)); |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
200 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
201 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
202 |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
203 |
| 183 | 204 void DatabaseWrapper::DeleteResource(int64_t id) |
| 205 { | |
| 206 signalRemainingAncestor_->Reset(); | |
| 207 | |
| 208 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Resources WHERE internalId=?"); | |
| 585 | 209 s.BindInt64(0, id); |
| 183 | 210 s.Run(); |
| 211 | |
| 1247 | 212 if (signalRemainingAncestor_->HasRemainingAncestor() && |
| 213 listener_ != NULL) | |
| 183 | 214 { |
| 1247 | 215 listener_->SignalRemainingAncestor(signalRemainingAncestor_->GetRemainingAncestorType(), |
| 216 signalRemainingAncestor_->GetRemainingAncestorId()); | |
| 183 | 217 } |
| 218 } | |
| 219 | |
| 220 | |
| 1301 | 221 bool DatabaseWrapper::GetParentPublicId(std::string& target, |
| 183 | 222 int64_t id) |
| 223 { | |
| 224 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b " | |
| 225 "WHERE a.internalId = b.parentId AND b.internalId = ?"); | |
| 585 | 226 s.BindInt64(0, id); |
| 183 | 227 |
| 228 if (s.Step()) | |
| 229 { | |
| 1301 | 230 target = s.ColumnString(0); |
| 183 | 231 return true; |
| 232 } | |
| 233 else | |
| 234 { | |
| 235 return false; | |
| 236 } | |
| 237 } | |
| 238 | |
| 239 | |
| 240 int64_t DatabaseWrapper::GetTableRecordCount(const std::string& table) | |
| 241 { | |
| 242 char buf[128]; | |
| 243 sprintf(buf, "SELECT COUNT(*) FROM %s", table.c_str()); | |
| 244 SQLite::Statement s(db_, buf); | |
| 245 | |
| 218 | 246 if (!s.Step()) |
| 247 { | |
| 248 throw OrthancException(ErrorCode_InternalError); | |
| 249 } | |
| 250 | |
| 183 | 251 int64_t c = s.ColumnInt(0); |
| 252 assert(!s.Step()); | |
| 253 | |
| 254 return c; | |
| 255 } | |
| 256 | |
| 257 | |
| 1847 | 258 DatabaseWrapper::DatabaseWrapper(const std::string& path) : |
| 259 listener_(NULL), | |
| 260 base_(db_), | |
| 261 signalRemainingAncestor_(NULL), | |
| 262 version_(0) | |
| 183 | 263 { |
| 264 db_.Open(path); | |
| 265 } | |
| 266 | |
| 1847 | 267 DatabaseWrapper::DatabaseWrapper() : |
| 268 listener_(NULL), | |
| 269 base_(db_), | |
| 270 signalRemainingAncestor_(NULL), | |
| 271 version_(0) | |
| 183 | 272 { |
| 273 db_.OpenInMemory(); | |
| 274 } | |
| 275 | |
| 276 void DatabaseWrapper::Open() | |
| 277 { | |
|
1717
3926e6317a43
SetIdentifierTagInternal
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1712
diff
changeset
|
278 db_.Execute("PRAGMA ENCODING=\"UTF-8\";"); |
|
3926e6317a43
SetIdentifierTagInternal
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1712
diff
changeset
|
279 |
| 374 | 280 // Performance tuning of SQLite with PRAGMAs |
| 281 // http://www.sqlite.org/pragma.html | |
| 282 db_.Execute("PRAGMA SYNCHRONOUS=NORMAL;"); | |
| 283 db_.Execute("PRAGMA JOURNAL_MODE=WAL;"); | |
| 284 db_.Execute("PRAGMA LOCKING_MODE=EXCLUSIVE;"); | |
| 285 db_.Execute("PRAGMA WAL_AUTOCHECKPOINT=1000;"); | |
| 286 //db_.Execute("PRAGMA TEMP_STORE=memory"); | |
| 287 | |
| 183 | 288 if (!db_.DoesTableExist("GlobalProperties")) |
| 289 { | |
| 290 LOG(INFO) << "Creating the database"; | |
| 291 std::string query; | |
|
203
9283552c25df
db refactoring done
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
292 EmbeddedResources::GetFileResource(query, EmbeddedResources::PREPARE_DATABASE); |
| 183 | 293 db_.Execute(query); |
| 294 } | |
| 295 | |
| 567 | 296 // Check the version of the database |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
297 std::string tmp; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
298 if (!LookupGlobalProperty(tmp, GlobalProperty_DatabaseSchemaVersion)) |
| 1239 | 299 { |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
300 tmp = "Unknown"; |
| 1239 | 301 } |
| 302 | |
| 252 | 303 bool ok = false; |
| 304 try | |
| 305 { | |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
306 LOG(INFO) << "Version of the Orthanc database: " << tmp; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
307 version_ = boost::lexical_cast<unsigned int>(tmp); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
308 ok = true; |
| 252 | 309 } |
| 310 catch (boost::bad_lexical_cast&) | |
| 311 { | |
| 312 } | |
| 313 | |
| 314 if (!ok) | |
| 315 { | |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
316 LOG(ERROR) << "Incompatible version of the Orthanc database: " << tmp; |
| 252 | 317 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
| 318 } | |
| 319 | |
| 183 | 320 signalRemainingAncestor_ = new Internals::SignalRemainingAncestor; |
| 321 db_.Register(signalRemainingAncestor_); | |
| 1247 | 322 } |
| 323 | |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
324 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
325 static void ExecuteUpgradeScript(SQLite::Connection& db, |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
326 EmbeddedResources::FileResourceId script) |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
327 { |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
328 std::string upgrade; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
329 EmbeddedResources::GetFileResource(upgrade, script); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
330 db.BeginTransaction(); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
331 db.Execute(upgrade); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
332 db.CommitTransaction(); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
333 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
334 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
335 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
336 void DatabaseWrapper::Upgrade(unsigned int targetVersion, |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
337 IStorageArea& storageArea) |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
338 { |
|
1664
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
339 if (targetVersion != 6) |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
340 { |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
341 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
342 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
343 |
|
1664
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
344 // This version of Orthanc is only compatible with versions 3, 4, |
|
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
345 // 5 and 6 of the DB schema |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
346 if (version_ != 3 && |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
347 version_ != 4 && |
|
1664
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
348 version_ != 5 && |
|
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
349 version_ != 6) |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
350 { |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
351 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
352 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
353 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
354 if (version_ == 3) |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
355 { |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
356 LOG(WARNING) << "Upgrading database version from 3 to 4"; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
357 ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_3_TO_4); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
358 version_ = 4; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
359 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
360 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
361 if (version_ == 4) |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
362 { |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
363 LOG(WARNING) << "Upgrading database version from 4 to 5"; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
364 ExecuteUpgradeScript(db_, EmbeddedResources::UPGRADE_DATABASE_4_TO_5); |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
365 version_ = 5; |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
366 } |
|
1664
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
367 |
|
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
368 if (version_ == 5) |
|
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
369 { |
|
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
370 LOG(WARNING) << "Upgrading database version from 5 to 6"; |
|
1668
de1413733c97
reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1665
diff
changeset
|
371 // No change in the DB schema, the step from version 5 to 6 only |
| 1710 | 372 // consists in reconstructing the main DICOM tags information |
| 373 // (as more tags got included). | |
|
1668
de1413733c97
reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1665
diff
changeset
|
374 db_.BeginTransaction(); |
| 2120 | 375 ServerToolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Patient); |
| 376 ServerToolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Study); | |
| 377 ServerToolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Series); | |
| 378 ServerToolbox::ReconstructMainDicomTags(*this, storageArea, ResourceType_Instance); | |
| 1710 | 379 db_.Execute("UPDATE GlobalProperties SET value=\"6\" WHERE property=" + |
| 380 boost::lexical_cast<std::string>(GlobalProperty_DatabaseSchemaVersion) + ";"); | |
|
1668
de1413733c97
reconstructing main dicom tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1665
diff
changeset
|
381 db_.CommitTransaction(); |
|
1664
0c58f189782d
prepare migration to db v6
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1615
diff
changeset
|
382 version_ = 6; |
| 1729 | 383 } |
|
1615
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
384 } |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
385 |
|
c40fe92a68e7
Primitives to upgrade the database version in plugins
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1509
diff
changeset
|
386 |
|
1432
0ac74fa21db8
rename IServerIndexListener as IDatabaseListener
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1407
diff
changeset
|
387 void DatabaseWrapper::SetListener(IDatabaseListener& listener) |
| 1247 | 388 { |
| 389 listener_ = &listener; | |
| 390 db_.Register(new Internals::SignalFileDeleted(listener)); | |
| 391 db_.Register(new Internals::SignalResourceDeleted(listener)); | |
| 183 | 392 } |
| 238 | 393 |
|
413
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
394 |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
395 void DatabaseWrapper::ClearTable(const std::string& tableName) |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
396 { |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
397 db_.Execute("DELETE FROM " + tableName); |
|
47d63c941902
clearing /exports and /changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
399
diff
changeset
|
398 } |
| 513 | 399 |
| 400 | |
|
1671
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
401 bool DatabaseWrapper::LookupParent(int64_t& parentId, |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
402 int64_t resourceId) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
403 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
404 bool found; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
405 ErrorCode error = base_.LookupParent(found, parentId, resourceId); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
406 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
407 if (error != ErrorCode_Success) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
408 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
409 throw OrthancException(error); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
410 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
411 else |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
412 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
413 return found; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
414 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
415 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
416 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
417 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
418 ResourceType DatabaseWrapper::GetResourceType(int64_t resourceId) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
419 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
420 ResourceType result; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
421 ErrorCode code = base_.GetResourceType(result, resourceId); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
422 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
423 if (code == ErrorCode_Success) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
424 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
425 return result; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
426 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
427 else |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
428 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
429 throw OrthancException(code); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
430 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
431 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
432 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
433 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
434 std::string DatabaseWrapper::GetPublicId(int64_t resourceId) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
435 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
436 std::string id; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
437 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
438 if (base_.GetPublicId(id, resourceId)) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
439 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
440 return id; |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
441 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
442 else |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
443 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
444 throw OrthancException(ErrorCode_UnknownResource); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
445 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
446 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
447 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
448 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
449 void DatabaseWrapper::GetChanges(std::list<ServerIndexChange>& target /*out*/, |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
450 bool& done /*out*/, |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
451 int64_t since, |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
452 uint32_t maxResults) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
453 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
454 ErrorCode code = base_.GetChanges(target, done, since, maxResults); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
455 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
456 if (code != ErrorCode_Success) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
457 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
458 throw OrthancException(code); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
459 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
460 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
461 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
462 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
463 void DatabaseWrapper::GetLastChange(std::list<ServerIndexChange>& target /*out*/) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
464 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
465 ErrorCode code = base_.GetLastChange(target); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
466 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
467 if (code != ErrorCode_Success) |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
468 { |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
469 throw OrthancException(code); |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
470 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
471 } |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
472 |
|
2f2e2ec17bc4
sample database plugin
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1670
diff
changeset
|
473 |
| 1301 | 474 void DatabaseWrapper::GetAllMetadata(std::map<MetadataType, std::string>& target, |
|
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
475 int64_t id) |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
476 { |
| 1301 | 477 target.clear(); |
|
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
478 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
479 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
|
480 s.BindInt64(0, id); |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
481 |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
482 while (s.Step()) |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
483 { |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
484 MetadataType key = static_cast<MetadataType>(s.ColumnInt(0)); |
| 1301 | 485 target[key] = s.ColumnString(1); |
|
1006
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
486 } |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
487 } |
|
649d47854314
proper handling of metadata in Store
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
831
diff
changeset
|
488 |
| 183 | 489 } |