Mercurial > hg > orthanc
comparison UnitTestsSources/ServerIndexTests.cpp @ 3073:0e9d1731b1b0 db-changes
refactoring to reuse DatabaseConstraint in separate projects
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 02 Jan 2019 13:44:18 +0100 |
parents | ce272138f15e |
children | ead8576a02ef |
comparison
equal
deleted
inserted
replaced
3072:1b05fd072c57 | 3073:0e9d1731b1b0 |
---|---|
258 assert(ServerToolbox::IsIdentifier(tag, level)); | 258 assert(ServerToolbox::IsIdentifier(tag, level)); |
259 | 259 |
260 DicomTagConstraint c(tag, type, value, true, true); | 260 DicomTagConstraint c(tag, type, value, true, true); |
261 | 261 |
262 std::vector<DatabaseConstraint> lookup; | 262 std::vector<DatabaseConstraint> lookup; |
263 lookup.push_back(DatabaseConstraint(c, level, DicomTagType_Identifier)); | 263 lookup.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
264 | 264 |
265 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); | 265 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
266 } | 266 } |
267 | 267 |
268 | 268 |
278 | 278 |
279 DicomTagConstraint c1(tag, type1, value1, true, true); | 279 DicomTagConstraint c1(tag, type1, value1, true, true); |
280 DicomTagConstraint c2(tag, type2, value2, true, true); | 280 DicomTagConstraint c2(tag, type2, value2, true, true); |
281 | 281 |
282 std::vector<DatabaseConstraint> lookup; | 282 std::vector<DatabaseConstraint> lookup; |
283 lookup.push_back(DatabaseConstraint(c1, level, DicomTagType_Identifier)); | 283 lookup.push_back(c1.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
284 lookup.push_back(DatabaseConstraint(c2, level, DicomTagType_Identifier)); | 284 lookup.push_back(c2.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); |
285 | 285 |
286 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); | 286 index_->ApplyLookupResources(result, NULL, lookup, level, 0 /* no limit */); |
287 } | 287 } |
288 }; | 288 }; |
289 } | 289 } |