comparison OrthancServer/Sources/Database/StatelessDatabaseOperations.cpp @ 5828:7030fa489669 find-refactoring

tools/find: QueryMetadata
author Alain Mazy <am@orthanc.team>
date Mon, 07 Oct 2024 15:19:26 +0200
parents 7c2b4fa94633
children
comparison
equal deleted inserted replaced
5827:976872a99d39 5828:7030fa489669
1591 1591
1592 result.clear(); 1592 result.clear();
1593 1593
1594 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true); 1594 DicomTagConstraint c(tag, ConstraintType_Equal, value, true, true);
1595 1595
1596 DatabaseConstraints query; 1596 DatabaseDicomTagConstraints query;
1597 bool isIdentical; // unused 1597 bool isIdentical; // unused
1598 query.AddConstraint(c.ConvertToDatabaseConstraint(isIdentical, level, DicomTagType_Identifier)); 1598 query.AddConstraint(c.ConvertToDatabaseConstraint(isIdentical, level, DicomTagType_Identifier));
1599 1599
1600 1600
1601 class Operations : public IReadOnlyOperations 1601 class Operations : public IReadOnlyOperations
1602 { 1602 {
1603 private: 1603 private:
1604 std::vector<std::string>& result_; 1604 std::vector<std::string>& result_;
1605 const DatabaseConstraints& query_; 1605 const DatabaseDicomTagConstraints& query_;
1606 ResourceType level_; 1606 ResourceType level_;
1607 1607
1608 public: 1608 public:
1609 Operations(std::vector<std::string>& result, 1609 Operations(std::vector<std::string>& result,
1610 const DatabaseConstraints& query, 1610 const DatabaseDicomTagConstraints& query,
1611 ResourceType level) : 1611 ResourceType level) :
1612 result_(result), 1612 result_(result),
1613 query_(query), 1613 query_(query),
1614 level_(level) 1614 level_(level)
1615 { 1615 {
1891 ResourceType queryLevel, 1891 ResourceType queryLevel,
1892 const std::set<std::string>& labels, 1892 const std::set<std::string>& labels,
1893 LabelsConstraint labelsConstraint, 1893 LabelsConstraint labelsConstraint,
1894 uint32_t limit) 1894 uint32_t limit)
1895 { 1895 {
1896 class Operations : public ReadOnlyOperationsT6<bool, const DatabaseConstraints&, ResourceType, 1896 class Operations : public ReadOnlyOperationsT6<bool, const DatabaseDicomTagConstraints&, ResourceType,
1897 const std::set<std::string>&, LabelsConstraint, size_t> 1897 const std::set<std::string>&, LabelsConstraint, size_t>
1898 { 1898 {
1899 private: 1899 private:
1900 std::list<std::string> resourcesList_; 1900 std::list<std::string> resourcesList_;
1901 std::list<std::string> instancesList_; 1901 std::list<std::string> instancesList_;
1937 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it) 1937 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it)
1938 { 1938 {
1939 ServerToolbox::CheckValidLabel(*it); 1939 ServerToolbox::CheckValidLabel(*it);
1940 } 1940 }
1941 1941
1942 DatabaseConstraints normalized; 1942 DatabaseDicomTagConstraints normalized;
1943 1943
1944 assert(mainDicomTagsRegistry_.get() != NULL); 1944 assert(mainDicomTagsRegistry_.get() != NULL);
1945 mainDicomTagsRegistry_->NormalizeLookup(normalized, lookup, queryLevel); 1945 mainDicomTagsRegistry_->NormalizeLookup(normalized, lookup, queryLevel);
1946 1946
1947 Operations operations; 1947 Operations operations;