Mercurial > hg > orthanc
annotate OrthancServer/DatabaseWrapper.cpp @ 273:d384af918264
more detailed signal about deleted file
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Sat, 08 Dec 2012 22:34:56 +0100 |
| parents | 4bc02e2254ec |
| children | 4eea080e6e7a |
| rev | line source |
|---|---|
| 183 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012 Medical Physics Department, CHU of Liege, | |
| 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 | |
| 33 #include "DatabaseWrapper.h" | |
| 34 | |
| 35 #include "../Core/DicomFormat/DicomArray.h" | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
36 #include "../Core/Uuid.h" |
| 183 | 37 #include "EmbeddedResources.h" |
| 38 | |
| 39 #include <glog/logging.h> | |
| 40 #include <stdio.h> | |
| 41 | |
| 42 namespace Orthanc | |
| 43 { | |
| 44 | |
| 45 namespace Internals | |
| 46 { | |
| 47 class SignalFileDeleted : public SQLite::IScalarFunction | |
| 48 { | |
| 49 private: | |
| 50 IServerIndexListener& listener_; | |
| 51 | |
| 52 public: | |
| 53 SignalFileDeleted(IServerIndexListener& listener) : | |
| 54 listener_(listener) | |
| 55 { | |
| 56 } | |
| 57 | |
| 58 virtual const char* GetName() const | |
| 59 { | |
| 60 return "SignalFileDeleted"; | |
| 61 } | |
| 62 | |
| 63 virtual unsigned int GetCardinality() const | |
| 64 { | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
65 return 5; |
| 183 | 66 } |
| 67 | |
| 68 virtual void Compute(SQLite::FunctionContext& context) | |
| 69 { | |
|
273
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
70 FileInfo info(context.GetStringValue(0), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
71 static_cast<FileContentType>(context.GetIntValue(1)), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
72 static_cast<uint64_t>(context.GetInt64Value(2)), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
73 static_cast<CompressionType>(context.GetIntValue(3)), |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
74 static_cast<uint64_t>(context.GetInt64Value(4))); |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
75 |
|
d384af918264
more detailed signal about deleted file
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
268
diff
changeset
|
76 listener_.SignalFileDeleted(info); |
| 183 | 77 } |
| 78 }; | |
| 79 | |
| 80 class SignalRemainingAncestor : public SQLite::IScalarFunction | |
| 81 { | |
| 82 private: | |
| 83 bool hasRemainingAncestor_; | |
| 84 std::string remainingPublicId_; | |
| 85 ResourceType remainingType_; | |
| 86 | |
| 87 public: | |
| 88 void Reset() | |
| 89 { | |
| 90 hasRemainingAncestor_ = false; | |
| 91 } | |
| 92 | |
| 93 virtual const char* GetName() const | |
| 94 { | |
| 95 return "SignalRemainingAncestor"; | |
| 96 } | |
| 97 | |
| 98 virtual unsigned int GetCardinality() const | |
| 99 { | |
| 100 return 2; | |
| 101 } | |
| 102 | |
| 103 virtual void Compute(SQLite::FunctionContext& context) | |
| 104 { | |
| 105 VLOG(1) << "There exists a remaining ancestor with public ID \"" | |
| 106 << context.GetStringValue(0) | |
| 107 << "\" of type " | |
| 108 << context.GetIntValue(1); | |
| 109 | |
| 110 if (!hasRemainingAncestor_ || | |
| 111 remainingType_ >= context.GetIntValue(1)) | |
| 112 { | |
| 113 hasRemainingAncestor_ = true; | |
| 114 remainingPublicId_ = context.GetStringValue(0); | |
| 115 remainingType_ = static_cast<ResourceType>(context.GetIntValue(1)); | |
| 116 } | |
| 117 } | |
| 118 | |
| 119 bool HasRemainingAncestor() const | |
| 120 { | |
| 121 return hasRemainingAncestor_; | |
| 122 } | |
| 123 | |
| 124 const std::string& GetRemainingAncestorId() const | |
| 125 { | |
| 126 assert(hasRemainingAncestor_); | |
| 127 return remainingPublicId_; | |
| 128 } | |
| 129 | |
| 130 ResourceType GetRemainingAncestorType() const | |
| 131 { | |
| 132 assert(hasRemainingAncestor_); | |
| 133 return remainingType_; | |
| 134 } | |
| 135 }; | |
| 136 } | |
| 137 | |
| 138 | |
| 139 | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
140 void DatabaseWrapper::SetGlobalProperty(GlobalProperty property, |
| 183 | 141 const std::string& value) |
| 142 { | |
| 143 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
|
144 s.BindInt(0, property); |
| 183 | 145 s.BindString(1, value); |
| 146 s.Run(); | |
| 147 } | |
| 148 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
149 bool DatabaseWrapper::LookupGlobalProperty(std::string& target, |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
150 GlobalProperty property) |
| 183 | 151 { |
| 152 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
153 "SELECT value FROM GlobalProperties WHERE property=?"); |
|
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
154 s.BindInt(0, property); |
| 183 | 155 |
| 156 if (!s.Step()) | |
| 157 { | |
| 158 return false; | |
| 159 } | |
| 160 else | |
| 161 { | |
| 162 target = s.ColumnString(0); | |
| 163 return true; | |
| 164 } | |
| 165 } | |
| 166 | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
167 std::string DatabaseWrapper::GetGlobalProperty(GlobalProperty property, |
| 183 | 168 const std::string& defaultValue) |
| 169 { | |
| 170 std::string s; | |
|
206
4453a010d0db
flush to disk thread
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
205
diff
changeset
|
171 if (LookupGlobalProperty(s, property)) |
| 183 | 172 { |
| 173 return s; | |
| 174 } | |
| 175 else | |
| 176 { | |
| 177 return defaultValue; | |
| 178 } | |
| 179 } | |
| 180 | |
| 181 int64_t DatabaseWrapper::CreateResource(const std::string& publicId, | |
| 182 ResourceType type) | |
| 183 { | |
| 184 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Resources VALUES(NULL, ?, ?, NULL)"); | |
| 185 s.BindInt(0, type); | |
| 186 s.BindString(1, publicId); | |
| 187 s.Run(); | |
|
189
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
188 int64_t id = db_.GetLastInsertRowId(); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
189 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
190 ChangeType changeType; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
191 switch (type) |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
192 { |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
193 case ResourceType_Patient: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
194 changeType = ChangeType_NewPatient; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
195 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
196 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
197 case ResourceType_Study: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
198 changeType = ChangeType_NewStudy; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
199 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
200 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
201 case ResourceType_Series: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
202 changeType = ChangeType_NewSeries; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
203 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
204 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
205 case ResourceType_Instance: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
206 changeType = ChangeType_NewInstance; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
207 break; |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
208 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
209 default: |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
210 throw OrthancException(ErrorCode_InternalError); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
211 } |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
212 |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
213 LogChange(changeType, id, type); |
|
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
214 return id; |
| 183 | 215 } |
| 216 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
217 bool DatabaseWrapper::LookupResource(const std::string& publicId, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
218 int64_t& id, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
219 ResourceType& type) |
| 183 | 220 { |
| 221 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 222 "SELECT internalId, resourceType FROM Resources WHERE publicId=?"); | |
| 223 s.BindString(0, publicId); | |
| 224 | |
| 225 if (!s.Step()) | |
| 226 { | |
| 227 return false; | |
| 228 } | |
| 229 else | |
| 230 { | |
| 231 id = s.ColumnInt(0); | |
| 232 type = static_cast<ResourceType>(s.ColumnInt(1)); | |
| 233 | |
| 234 // Check whether there is a single resource with this public id | |
| 235 assert(!s.Step()); | |
| 236 | |
| 237 return true; | |
| 238 } | |
| 239 } | |
| 240 | |
|
198
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
241 bool DatabaseWrapper::LookupParent(int64_t& parentId, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
242 int64_t resourceId) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
243 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
244 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
245 "SELECT parentId FROM Resources WHERE internalId=?"); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
246 s.BindInt(0, resourceId); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
247 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
248 if (!s.Step()) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
249 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
250 throw OrthancException(ErrorCode_UnknownResource); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
251 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
252 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
253 if (s.ColumnIsNull(0)) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
254 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
255 return false; |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
256 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
257 else |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
258 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
259 parentId = s.ColumnInt(0); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
260 return true; |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
261 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
262 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
263 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
264 std::string DatabaseWrapper::GetPublicId(int64_t resourceId) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
265 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
266 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
267 "SELECT publicId FROM Resources WHERE internalId=?"); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
268 s.BindInt(0, resourceId); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
269 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
270 if (!s.Step()) |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
271 { |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
272 throw OrthancException(ErrorCode_UnknownResource); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
273 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
274 |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
275 return s.ColumnString(0); |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
276 } |
|
663cc6c46d0a
before refactoring of ServerIndex::GetXXX
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
197
diff
changeset
|
277 |
| 183 | 278 void DatabaseWrapper::AttachChild(int64_t parent, |
| 279 int64_t child) | |
| 280 { | |
| 281 SQLite::Statement s(db_, SQLITE_FROM_HERE, "UPDATE Resources SET parentId = ? WHERE internalId = ?"); | |
| 282 s.BindInt(0, parent); | |
| 283 s.BindInt(1, child); | |
| 284 s.Run(); | |
| 285 } | |
| 286 | |
|
193
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
287 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
|
288 int64_t id) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
289 { |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
290 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE parentId=?"); |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
291 s.BindInt(0, id); |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
292 |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
293 childrenPublicIds = Json::arrayValue; |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
294 while (s.Step()) |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
295 { |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
296 childrenPublicIds.append(s.ColumnString(0)); |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
297 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
298 } |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
299 |
|
a1b9d1e1497b
failed attempt to compile with linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
192
diff
changeset
|
300 |
| 183 | 301 void DatabaseWrapper::DeleteResource(int64_t id) |
| 302 { | |
| 303 signalRemainingAncestor_->Reset(); | |
| 304 | |
| 305 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM Resources WHERE internalId=?"); | |
| 306 s.BindInt(0, id); | |
| 307 s.Run(); | |
| 308 | |
| 309 if (signalRemainingAncestor_->HasRemainingAncestor()) | |
| 310 { | |
| 311 listener_.SignalRemainingAncestor(signalRemainingAncestor_->GetRemainingAncestorType(), | |
| 312 signalRemainingAncestor_->GetRemainingAncestorId()); | |
| 313 } | |
| 314 } | |
| 315 | |
| 316 void DatabaseWrapper::SetMetadata(int64_t id, | |
| 317 MetadataType type, | |
| 318 const std::string& value) | |
| 319 { | |
| 320 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT OR REPLACE INTO Metadata VALUES(?, ?, ?)"); | |
| 321 s.BindInt(0, id); | |
| 322 s.BindInt(1, type); | |
| 323 s.BindString(2, value); | |
| 324 s.Run(); | |
| 325 } | |
| 326 | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
327 bool DatabaseWrapper::LookupMetadata(std::string& target, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
328 int64_t id, |
|
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
329 MetadataType type) |
| 183 | 330 { |
| 331 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 332 "SELECT value FROM Metadata WHERE id=? AND type=?"); | |
| 333 s.BindInt(0, id); | |
| 334 s.BindInt(1, type); | |
| 335 | |
| 336 if (!s.Step()) | |
| 337 { | |
| 338 return false; | |
| 339 } | |
| 340 else | |
| 341 { | |
| 342 target = s.ColumnString(0); | |
| 343 return true; | |
| 344 } | |
| 345 } | |
| 346 | |
| 347 std::string DatabaseWrapper::GetMetadata(int64_t id, | |
| 348 MetadataType type, | |
| 349 const std::string& defaultValue) | |
| 350 { | |
| 351 std::string s; | |
|
188
090cefdab1d1
fix because of Windows macros
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
187
diff
changeset
|
352 if (LookupMetadata(s, id, type)) |
| 183 | 353 { |
| 354 return s; | |
| 355 } | |
| 356 else | |
| 357 { | |
| 358 return defaultValue; | |
| 359 } | |
| 360 } | |
| 361 | |
|
200
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
362 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
363 bool DatabaseWrapper::GetMetadataAsInteger(int& result, |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
364 int64_t id, |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
365 MetadataType type) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
366 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
367 std::string s = GetMetadata(id, type, ""); |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
368 if (s.size() == 0) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
369 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
370 return false; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
371 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
372 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
373 try |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
374 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
375 result = boost::lexical_cast<int>(s); |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
376 return true; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
377 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
378 catch (boost::bad_lexical_cast&) |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
379 { |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
380 return false; |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
381 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
382 } |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
383 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
384 |
|
9c58b2b03cf0
refactoring of read operations
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
199
diff
changeset
|
385 |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
386 void DatabaseWrapper::AddAttachment(int64_t id, |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
387 const FileInfo& attachment) |
| 183 | 388 { |
| 389 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO AttachedFiles VALUES(?, ?, ?, ?, ?, ?)"); | |
| 390 s.BindInt(0, id); | |
| 233 | 391 s.BindInt(1, attachment.GetContentType()); |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
392 s.BindString(2, attachment.GetUuid()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
393 s.BindInt(3, attachment.GetCompressedSize()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
394 s.BindInt(4, attachment.GetUncompressedSize()); |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
395 s.BindInt(5, attachment.GetCompressionType()); |
| 183 | 396 s.Run(); |
| 397 } | |
| 398 | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
399 bool DatabaseWrapper::LookupAttachment(FileInfo& attachment, |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
400 int64_t id, |
| 233 | 401 FileContentType contentType) |
| 183 | 402 { |
| 403 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
404 "SELECT uuid, uncompressedSize, compressionType, compressedSize FROM AttachedFiles WHERE id=? AND fileType=?"); |
| 183 | 405 s.BindInt(0, id); |
|
197
530a25320461
removal of text as ids in sqlite db
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
193
diff
changeset
|
406 s.BindInt(1, contentType); |
| 183 | 407 |
| 408 if (!s.Step()) | |
| 409 { | |
| 410 return false; | |
| 411 } | |
| 412 else | |
| 413 { | |
|
232
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
414 attachment = FileInfo(s.ColumnString(0), |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
415 contentType, |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
416 s.ColumnInt(1), |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
417 static_cast<CompressionType>(s.ColumnInt(2)), |
|
5368bbe813cf
refactoring of attachments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
231
diff
changeset
|
418 s.ColumnInt(3)); |
| 183 | 419 return true; |
| 420 } | |
| 421 } | |
| 422 | |
| 423 void DatabaseWrapper::SetMainDicomTags(int64_t id, | |
| 424 const DicomMap& tags) | |
| 425 { | |
| 426 DicomArray flattened(tags); | |
| 427 for (size_t i = 0; i < flattened.GetSize(); i++) | |
| 428 { | |
| 429 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO MainDicomTags VALUES(?, ?, ?, ?)"); | |
| 430 s.BindInt(0, id); | |
| 431 s.BindInt(1, flattened.GetElement(i).GetTag().GetGroup()); | |
| 432 s.BindInt(2, flattened.GetElement(i).GetTag().GetElement()); | |
| 433 s.BindString(3, flattened.GetElement(i).GetValue().AsString()); | |
| 434 s.Run(); | |
| 435 } | |
| 436 } | |
| 437 | |
| 438 void DatabaseWrapper::GetMainDicomTags(DicomMap& map, | |
| 439 int64_t id) | |
| 440 { | |
| 441 map.Clear(); | |
| 442 | |
| 443 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM MainDicomTags WHERE id=?"); | |
| 444 s.BindInt(0, id); | |
| 445 while (s.Step()) | |
| 446 { | |
| 447 map.SetValue(s.ColumnInt(1), | |
| 448 s.ColumnInt(2), | |
| 449 s.ColumnString(3)); | |
| 450 } | |
| 451 } | |
| 452 | |
| 453 | |
| 454 bool DatabaseWrapper::GetParentPublicId(std::string& result, | |
| 455 int64_t id) | |
| 456 { | |
| 457 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b " | |
| 458 "WHERE a.internalId = b.parentId AND b.internalId = ?"); | |
| 459 s.BindInt(0, id); | |
| 460 | |
| 461 if (s.Step()) | |
| 462 { | |
| 463 result = s.ColumnString(0); | |
| 464 return true; | |
| 465 } | |
| 466 else | |
| 467 { | |
| 468 return false; | |
| 469 } | |
| 470 } | |
| 471 | |
| 472 | |
| 473 void DatabaseWrapper::GetChildrenPublicId(std::list<std::string>& result, | |
| 474 int64_t id) | |
| 475 { | |
| 476 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.publicId FROM Resources AS a, Resources AS b " | |
| 477 "WHERE a.parentId = b.internalId AND b.internalId = ?"); | |
| 478 s.BindInt(0, id); | |
| 479 | |
| 480 result.clear(); | |
| 481 | |
| 482 while (s.Step()) | |
| 483 { | |
| 484 result.push_back(s.ColumnString(0)); | |
| 485 } | |
| 486 } | |
| 487 | |
| 488 | |
| 199 | 489 void DatabaseWrapper::GetChildrenInternalId(std::list<int64_t>& result, |
| 490 int64_t id) | |
| 491 { | |
| 492 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT a.internalId FROM Resources AS a, Resources AS b " | |
| 493 "WHERE a.parentId = b.internalId AND b.internalId = ?"); | |
| 494 s.BindInt(0, id); | |
| 495 | |
| 496 result.clear(); | |
| 497 | |
| 498 while (s.Step()) | |
| 499 { | |
| 500 result.push_back(s.ColumnInt(0)); | |
| 501 } | |
| 502 } | |
| 503 | |
| 504 | |
| 183 | 505 void DatabaseWrapper::LogChange(ChangeType changeType, |
|
189
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
506 int64_t internalId, |
| 183 | 507 ResourceType resourceType, |
| 508 const boost::posix_time::ptime& date) | |
| 509 { | |
| 510 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO Changes VALUES(NULL, ?, ?, ?, ?)"); | |
| 511 s.BindInt(0, changeType); | |
|
189
ccbc2cf64a0d
record main dicom tags and changes
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
188
diff
changeset
|
512 s.BindInt(1, internalId); |
| 183 | 513 s.BindInt(2, resourceType); |
| 514 s.BindString(3, boost::posix_time::to_iso_string(date)); | |
| 515 s.Run(); | |
| 516 } | |
| 517 | |
| 518 | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
519 void DatabaseWrapper::GetChangesInternal(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
520 SQLite::Statement& s, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
521 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
522 unsigned int maxResults) |
| 204 | 523 { |
| 524 Json::Value changes = Json::arrayValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
525 int64_t last = since; |
| 204 | 526 |
| 527 while (changes.size() < maxResults && s.Step()) | |
| 528 { | |
| 529 int64_t seq = s.ColumnInt(0); | |
| 530 ChangeType changeType = static_cast<ChangeType>(s.ColumnInt(1)); | |
| 531 int64_t internalId = s.ColumnInt(2); | |
| 532 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(3)); | |
| 533 const std::string& date = s.ColumnString(4); | |
|
205
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
534 std::string publicId = GetPublicId(internalId); |
| 204 | 535 |
| 536 Json::Value item = Json::objectValue; | |
| 537 item["Seq"] = static_cast<int>(seq); | |
| 538 item["ChangeType"] = ToString(changeType); | |
| 539 item["ResourceType"] = ToString(resourceType); | |
|
205
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
540 item["ID"] = publicId; |
|
6ab754744446
logging of completed series
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
204
diff
changeset
|
541 item["Path"] = GetBasePath(resourceType, publicId); |
| 204 | 542 item["Date"] = date; |
| 543 last = seq; | |
| 544 | |
| 545 changes.append(item); | |
| 546 } | |
| 547 | |
| 548 target = Json::objectValue; | |
| 549 target["Changes"] = changes; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
550 target["Done"] = !(changes.size() == maxResults && s.Step()); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
551 target["Last"] = static_cast<int>(last); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
552 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
553 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
554 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
555 void DatabaseWrapper::GetChanges(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
556 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
557 unsigned int maxResults) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
558 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
559 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT * FROM Changes WHERE seq>? ORDER BY seq LIMIT ?"); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
560 s.BindInt(0, since); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
561 s.BindInt(1, maxResults + 1); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
562 GetChangesInternal(target, s, since, maxResults); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
563 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
564 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
565 void DatabaseWrapper::GetLastChange(Json::Value& target) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
566 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
567 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
|
568 GetChangesInternal(target, s, 0, 1); |
| 204 | 569 } |
| 570 | |
| 571 | |
| 231 | 572 void DatabaseWrapper::LogExportedResource(ResourceType resourceType, |
| 573 const std::string& publicId, | |
| 574 const std::string& remoteModality, | |
| 575 const std::string& patientId, | |
| 576 const std::string& studyInstanceUid, | |
| 577 const std::string& seriesInstanceUid, | |
| 578 const std::string& sopInstanceUid, | |
| 183 | 579 const boost::posix_time::ptime& date) |
| 580 { | |
| 231 | 581 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
| 582 "INSERT INTO ExportedResources VALUES(NULL, ?, ?, ?, ?, ?, ?, ?, ?)"); | |
| 583 | |
| 584 s.BindInt(0, resourceType); | |
| 585 s.BindString(1, publicId); | |
| 586 s.BindString(2, remoteModality); | |
| 587 s.BindString(3, patientId); | |
| 588 s.BindString(4, studyInstanceUid); | |
| 589 s.BindString(5, seriesInstanceUid); | |
| 590 s.BindString(6, sopInstanceUid); | |
| 591 s.BindString(7, boost::posix_time::to_iso_string(date)); | |
| 592 | |
| 183 | 593 s.Run(); |
| 594 } | |
| 231 | 595 |
| 596 | |
| 597 void DatabaseWrapper::GetExportedResources(Json::Value& target, | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
598 SQLite::Statement& s, |
| 231 | 599 int64_t since, |
| 600 unsigned int maxResults) | |
| 601 { | |
| 602 Json::Value changes = Json::arrayValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
603 int64_t last = since; |
| 231 | 604 |
| 605 while (changes.size() < maxResults && s.Step()) | |
| 606 { | |
| 607 int64_t seq = s.ColumnInt(0); | |
| 608 ResourceType resourceType = static_cast<ResourceType>(s.ColumnInt(1)); | |
| 609 std::string publicId = s.ColumnString(2); | |
| 610 | |
| 611 Json::Value item = Json::objectValue; | |
| 612 item["Seq"] = static_cast<int>(seq); | |
| 613 item["ResourceType"] = ToString(resourceType); | |
| 614 item["ID"] = publicId; | |
| 615 item["Path"] = GetBasePath(resourceType, publicId); | |
| 616 item["RemoteModality"] = s.ColumnString(3); | |
| 617 item["Date"] = s.ColumnString(8); | |
| 618 | |
| 619 // WARNING: Do not add "break" below and do not reorder the case items! | |
| 620 switch (resourceType) | |
| 621 { | |
| 622 case ResourceType_Instance: | |
| 623 item["SopInstanceUid"] = s.ColumnString(7); | |
| 624 | |
| 625 case ResourceType_Series: | |
| 626 item["SeriesInstanceUid"] = s.ColumnString(6); | |
| 627 | |
| 628 case ResourceType_Study: | |
| 629 item["StudyInstanceUid"] = s.ColumnString(5); | |
| 630 | |
| 631 case ResourceType_Patient: | |
| 632 item["PatientId"] = s.ColumnString(4); | |
| 633 break; | |
| 634 | |
| 635 default: | |
| 636 throw OrthancException(ErrorCode_InternalError); | |
| 637 } | |
| 638 | |
| 639 last = seq; | |
| 640 | |
| 641 changes.append(item); | |
| 642 } | |
| 643 | |
| 644 target = Json::objectValue; | |
|
237
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
645 target["Exports"] = changes; |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
646 target["Done"] = !(changes.size() == maxResults && s.Step()); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
647 target["Last"] = static_cast<int>(last); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
648 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
649 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
650 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
651 void DatabaseWrapper::GetExportedResources(Json::Value& target, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
652 int64_t since, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
653 unsigned int maxResults) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
654 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
655 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
656 "SELECT * FROM ExportedResources WHERE seq>? ORDER BY seq LIMIT ?"); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
657 s.BindInt(0, since); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
658 s.BindInt(1, maxResults + 1); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
659 GetExportedResources(target, s, since, maxResults); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
660 } |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
661 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
662 |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
663 void DatabaseWrapper::GetLastExportedResource(Json::Value& target) |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
664 { |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
665 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
666 "SELECT * FROM ExportedResources ORDER BY seq DESC LIMIT 1"); |
|
16a4ac70bd8a
last change and export
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
233
diff
changeset
|
667 GetExportedResources(target, s, 0, 1); |
| 231 | 668 } |
| 669 | |
| 670 | |
| 183 | 671 |
| 672 | |
| 673 int64_t DatabaseWrapper::GetTableRecordCount(const std::string& table) | |
| 674 { | |
| 675 char buf[128]; | |
| 676 sprintf(buf, "SELECT COUNT(*) FROM %s", table.c_str()); | |
| 677 SQLite::Statement s(db_, buf); | |
| 678 | |
| 218 | 679 if (!s.Step()) |
| 680 { | |
| 681 throw OrthancException(ErrorCode_InternalError); | |
| 682 } | |
| 683 | |
| 183 | 684 int64_t c = s.ColumnInt(0); |
| 685 assert(!s.Step()); | |
| 686 | |
| 687 return c; | |
| 688 } | |
| 689 | |
| 690 | |
| 691 uint64_t DatabaseWrapper::GetTotalCompressedSize() | |
| 692 { | |
| 693 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(compressedSize) FROM AttachedFiles"); | |
| 694 s.Run(); | |
| 695 return static_cast<uint64_t>(s.ColumnInt64(0)); | |
| 696 } | |
| 697 | |
| 698 | |
| 699 uint64_t DatabaseWrapper::GetTotalUncompressedSize() | |
| 700 { | |
| 701 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT SUM(uncompressedSize) FROM AttachedFiles"); | |
| 702 s.Run(); | |
| 703 return static_cast<uint64_t>(s.ColumnInt64(0)); | |
| 704 } | |
| 705 | |
| 190 | 706 void DatabaseWrapper::GetAllPublicIds(Json::Value& target, |
| 707 ResourceType resourceType) | |
| 708 { | |
| 709 SQLite::Statement s(db_, SQLITE_FROM_HERE, "SELECT publicId FROM Resources WHERE resourceType=?"); | |
| 710 s.BindInt(0, resourceType); | |
| 711 | |
| 712 target = Json::arrayValue; | |
| 713 while (s.Step()) | |
| 714 { | |
| 715 target.append(s.ColumnString(0)); | |
| 716 } | |
| 717 } | |
| 718 | |
| 183 | 719 |
| 720 DatabaseWrapper::DatabaseWrapper(const std::string& path, | |
| 721 IServerIndexListener& listener) : | |
| 722 listener_(listener) | |
| 723 { | |
| 724 db_.Open(path); | |
| 725 Open(); | |
| 726 } | |
| 727 | |
| 728 DatabaseWrapper::DatabaseWrapper(IServerIndexListener& listener) : | |
| 729 listener_(listener) | |
| 730 { | |
| 731 db_.OpenInMemory(); | |
| 732 Open(); | |
| 733 } | |
| 734 | |
| 735 void DatabaseWrapper::Open() | |
| 736 { | |
| 737 if (!db_.DoesTableExist("GlobalProperties")) | |
| 738 { | |
| 739 LOG(INFO) << "Creating the database"; | |
| 740 std::string query; | |
|
203
9283552c25df
db refactoring done
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
200
diff
changeset
|
741 EmbeddedResources::GetFileResource(query, EmbeddedResources::PREPARE_DATABASE); |
| 183 | 742 db_.Execute(query); |
| 743 } | |
| 744 | |
| 252 | 745 // Sanity check of the version of the database |
| 746 std::string version = GetGlobalProperty(GlobalProperty_DatabaseSchemaVersion, "Unknown"); | |
| 747 bool ok = false; | |
| 748 try | |
| 749 { | |
| 750 LOG(INFO) << "Version of the Orthanc database: " << version; | |
| 751 unsigned int v = boost::lexical_cast<unsigned int>(version); | |
| 752 | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
753 // This version of Orthanc is only compatible with version 3 of |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
754 // the DB schema (since Orthanc 0.3.2) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
755 ok = (v == 3); |
| 252 | 756 } |
| 757 catch (boost::bad_lexical_cast&) | |
| 758 { | |
| 759 } | |
| 760 | |
| 761 if (!ok) | |
| 762 { | |
| 763 throw OrthancException(ErrorCode_IncompatibleDatabaseVersion); | |
| 764 } | |
| 765 | |
| 183 | 766 signalRemainingAncestor_ = new Internals::SignalRemainingAncestor; |
| 767 db_.Register(signalRemainingAncestor_); | |
| 768 db_.Register(new Internals::SignalFileDeleted(listener_)); | |
| 769 } | |
| 238 | 770 |
| 771 uint64_t DatabaseWrapper::GetResourceCount(ResourceType resourceType) | |
| 772 { | |
| 773 SQLite::Statement s(db_, SQLITE_FROM_HERE, | |
| 774 "SELECT COUNT(*) FROM Resources WHERE resourceType=?"); | |
| 775 s.BindInt(0, resourceType); | |
| 776 | |
| 777 if (!s.Step()) | |
| 778 { | |
| 779 throw OrthancException(ErrorCode_InternalError); | |
| 780 } | |
| 781 | |
| 782 int64_t c = s.ColumnInt(0); | |
| 783 assert(!s.Step()); | |
| 784 | |
| 785 return c; | |
| 786 } | |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
787 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
788 bool DatabaseWrapper::SelectPatientToRecycle(int64_t& internalId) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
789 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
790 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
791 "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
|
792 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
793 if (!s.Step()) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
794 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
795 // No patient remaining or all the patients are protected |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
796 return false; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
797 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
798 else |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
799 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
800 internalId = s.ColumnInt(0); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
801 return true; |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
802 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
803 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
804 |
|
268
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
805 bool DatabaseWrapper::SelectPatientToRecycle(int64_t& internalId, |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
806 int64_t patientIdToAvoid) |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
807 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
808 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
809 "SELECT patientId FROM PatientRecyclingOrder " |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
810 "WHERE patientId != ? ORDER BY seq ASC LIMIT 1"); |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
811 s.BindInt(0, patientIdToAvoid); |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
812 |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
813 if (!s.Step()) |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
814 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
815 // No patient remaining or all the patients are protected |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
816 return false; |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
817 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
818 else |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
819 { |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
820 internalId = s.ColumnInt(0); |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
821 return true; |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
822 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
823 } |
|
4bc02e2254ec
preparing ServerIndex for recycling
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
262
diff
changeset
|
824 |
|
262
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
825 bool DatabaseWrapper::IsProtectedPatient(int64_t internalId) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
826 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
827 SQLite::Statement s(db_, SQLITE_FROM_HERE, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
828 "SELECT * FROM PatientRecyclingOrder WHERE patientId = ?"); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
829 s.BindInt(0, internalId); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
830 return !s.Step(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
831 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
832 |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
833 void DatabaseWrapper::SetProtectedPatient(int64_t internalId, |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
834 bool isProtected) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
835 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
836 if (isProtected) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
837 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
838 SQLite::Statement s(db_, SQLITE_FROM_HERE, "DELETE FROM PatientRecyclingOrder WHERE patientId=?"); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
839 s.BindInt(0, internalId); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
840 s.Run(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
841 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
842 else if (IsProtectedPatient(internalId)) |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
843 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
844 SQLite::Statement s(db_, SQLITE_FROM_HERE, "INSERT INTO PatientRecyclingOrder VALUES(NULL, ?)"); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
845 s.BindInt(0, internalId); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
846 s.Run(); |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
847 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
848 else |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
849 { |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
850 // Nothing to do: The patient is already unprotected |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
851 } |
|
2354560daf2f
primitives for recycling patients
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
252
diff
changeset
|
852 } |
| 183 | 853 } |