Mercurial > hg > orthanc
diff OrthancServer/Search/HierarchicalMatcher.h @ 3071:2df061cf2fec db-changes
getting rid of IFindConstraint hierarchy
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 02 Jan 2019 11:26:27 +0100 |
parents | 4e43e67f8ecf |
children | cf8cbeb35f33 |
line wrap: on
line diff
--- a/OrthancServer/Search/HierarchicalMatcher.h Wed Jan 02 10:13:11 2019 +0100 +++ b/OrthancServer/Search/HierarchicalMatcher.h Wed Jan 02 11:26:27 2019 +0100 @@ -33,7 +33,7 @@ #pragma once -#include "IFindConstraint.h" +#include "DatabaseLookup.h" #include "../../Core/DicomParsing/ParsedDicomFile.h" class DcmItem; @@ -43,11 +43,11 @@ class HierarchicalMatcher : public boost::noncopyable { private: - typedef std::map<DicomTag, IFindConstraint*> Constraints; typedef std::map<DicomTag, HierarchicalMatcher*> Sequences; - Constraints constraints_; - Sequences sequences_; + std::set<DicomTag> flatTags_; + DatabaseLookup flatConstraints_; + Sequences sequences_; void Setup(DcmItem& query, bool caseSensitivePN,