Mercurial > hg > orthanc

comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5681:77875b51cf95 find-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->find-refactoring
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Jul 2024 10:15:15 +0200
parents 527918e9c5d9 68fc5af30c03
children 023787ecaff2
comparison
equal deleted inserted replaced
5679:527918e9c5d9 5681:77875b51cf95
1549 1549
1550 result.clear(); 1550 result.clear();
1551 1551
1552 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true); 1552 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
1553 1553
1554 std::vector<DatabaseConstraint> query; 1554 DatabaseConstraints query;
1555 query.push_back(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier)); 1555 query.AddConstraint(c.ConvertToDatabaseConstraint(level, DicomTagType_Identifier));
1556 1556
1557 1557
1558 class Operations : public IReadOnlyOperations 1558 class Operations : public IReadOnlyOperations
1559 { 1559 {
1560 private: 1560 private:
1561 std::vector<std::string>& result_; 1561 std::vector<std::string>& result_;
1562 const std::vector<DatabaseConstraint>& query_; 1562 const DatabaseConstraints& query_;
1563 ResourceType level_; 1563 ResourceType level_;
1564 1564
1565 public: 1565 public:
1566 Operations(std::vector<std::string>& result, 1566 Operations(std::vector<std::string>& result,
1567 const std::vector<DatabaseConstraint>& query, 1567 const DatabaseConstraints& query,
1568 ResourceType level) : 1568 ResourceType level) :
1569 result_(result), 1569 result_(result),
1570 query_(query), 1570 query_(query),
1571 level_(level) 1571 level_(level)
1572 { 1572 {
1848 ResourceType queryLevel, 1848 ResourceType queryLevel,
1849 const std::set<std::string>& labels, 1849 const std::set<std::string>& labels,
1850 LabelsConstraint labelsConstraint, 1850 LabelsConstraint labelsConstraint,
1851 uint32_t limit) 1851 uint32_t limit)
1852 { 1852 {
1853 class Operations : public ReadOnlyOperationsT6<bool, const std::vector<DatabaseConstraint>&, ResourceType, 1853 class Operations : public ReadOnlyOperationsT6<bool, const DatabaseConstraints&, ResourceType,
1854 const std::set<std::string>&, LabelsConstraint, size_t> 1854 const std::set<std::string>&, LabelsConstraint, size_t>
1855 { 1855 {
1856 private: 1856 private:
1857 std::list<std::string> resourcesList_; 1857 std::list<std::string> resourcesList_;
1858 std::list<std::string> instancesList_; 1858 std::list<std::string> instancesList_;
1894 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it) 1894 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
1895 { 1895 {
1896 ServerToolbox::CheckValidLabel(*it); 1896 ServerToolbox::CheckValidLabel(*it);
1897 } 1897 }
1898 1898
1899 std::vector<DatabaseConstraint> normalized; 1899 DatabaseConstraints normalized;
1900 1900
1901 assert(mainDicomTagsRegistry_.get() != NULL); 1901 assert(mainDicomTagsRegistry_.get() != NULL);
1902 mainDicomTagsRegistry_->NormalizeLookup(normalized, lookup, queryLevel); 1902 mainDicomTagsRegistry_->NormalizeLookup(normalized, lookup, queryLevel);
1903 1903
1904 Operations operations; 1904 Operations operations;