Mercurial > hg > orthanc

comparison OrthancServer/Search/HierarchicalMatcher.h @ 3071:2df061cf2fec db-changes

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3070:1bc4a1bb66e9 3071:2df061cf2fec
31 **/ 31 **/
32 32
33 33
34 #pragma once 34 #pragma once
35 35
36 #include "IFindConstraint.h" 36 #include "DatabaseLookup.h"
37 #include "../../Core/DicomParsing/ParsedDicomFile.h" 37 #include "../../Core/DicomParsing/ParsedDicomFile.h"
38 38
39 class DcmItem; 39 class DcmItem;
40 40
41 namespace Orthanc 41 namespace Orthanc
42 { 42 {
43 class HierarchicalMatcher : public boost::noncopyable 43 class HierarchicalMatcher : public boost::noncopyable
44 { 44 {
45 private: 45 private:
46 typedef std::map<DicomTag, IFindConstraint*> Constraints;
47 typedef std::map<DicomTag, HierarchicalMatcher*> Sequences; 46 typedef std::map<DicomTag, HierarchicalMatcher*> Sequences;
48 47
49 Constraints constraints_; 48 std::set<DicomTag> flatTags_;
50 Sequences sequences_; 49 DatabaseLookup flatConstraints_;
50 Sequences sequences_;
51 51
52 void Setup(DcmItem& query, 52 void Setup(DcmItem& query,
53 bool caseSensitivePN, 53 bool caseSensitivePN,
54 Encoding encoding); 54 Encoding encoding);
55 55