Mercurial > hg > orthanc
annotate OrthancServer/Database/Compatibility/DatabaseLookup.cpp @ 3093:2e1808b6146a db-changes
reorganization of folders
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Sat, 05 Jan 2019 16:09:21 +0100 |
parents | OrthancServer/Search/Compatibility/DatabaseLookup.cpp@c829758b9ca0 |
children | 61da3c9b4121 |
rev | line source |
---|---|
3052
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
3062
5ebd2ef5e7ae
preparing for 2019
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3055
diff
changeset
|
5 * Copyright (C) 2017-2019 Osimis S.A., Belgium |
3052
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * modify it under the terms of the GNU General Public License as |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * published by the Free Software Foundation, either version 3 of the |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * License, or (at your option) any later version. |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * In addition, as a special exception, the copyright holders of this |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * program give permission to link the code of its release with the |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * that use the same license as the "OpenSSL" library), and distribute |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * the linked executables. You must obey the GNU General Public License |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * in all respects for all of the code used other than "OpenSSL". If you |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 * modify file(s) with this exception, you may extend this exception to |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * your version of the file(s), but you are not obligated to do so. If |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * you do not wish to do so, delete this exception statement from your |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * version. If you delete this exception statement from all source files |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * in the program, then also delete it here. |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 * |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * This program is distributed in the hope that it will be useful, but |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * WITHOUT ANY WARRANTY; without even the implied warranty of |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * General Public License for more details. |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * You should have received a copy of the GNU General Public License |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 **/ |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include "../../PrecompiledHeadersServer.h" |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 #include "DatabaseLookup.h" |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
37 #include "../../../Core/OrthancException.h" |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
38 #include "../../ServerToolbox.h" |
3052
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 #include "SetOfResources.h" |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 namespace Orthanc |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 { |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 namespace Compatibility |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
44 { |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
45 namespace |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
46 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
47 // Anonymous namespace to avoid clashes between compiler modules |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
48 class MainTagsConstraints : boost::noncopyable |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
49 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
50 private: |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
51 std::vector<DicomTagConstraint*> constraints_; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
52 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
53 public: |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
54 ~MainTagsConstraints() |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
55 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
56 for (size_t i = 0; i < constraints_.size(); i++) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
57 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
58 assert(constraints_[i] != NULL); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
59 delete constraints_[i]; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
60 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
61 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
62 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
63 void Reserve(size_t n) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
64 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
65 constraints_.reserve(n); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
66 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
67 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
68 size_t GetSize() const |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
69 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
70 return constraints_.size(); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
71 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
72 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
73 DicomTagConstraint& GetConstraint(size_t i) const |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
74 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
75 if (i >= constraints_.size()) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
76 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
77 throw OrthancException(ErrorCode_ParameterOutOfRange); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
78 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
79 else |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
80 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
81 assert(constraints_[i] != NULL); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
82 return *constraints_[i]; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
83 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
84 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
85 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
86 void Add(const DatabaseConstraint& constraint) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
87 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
88 constraints_.push_back(new DicomTagConstraint(constraint)); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
89 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
90 }; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
91 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
92 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
93 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
94 static void ApplyIdentifierConstraint(SetOfResources& candidates, |
3085 | 95 ILookupResources& compatibility, |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
96 const DatabaseConstraint& constraint, |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
97 ResourceType level) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
98 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
99 std::list<int64_t> matches; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
100 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
101 switch (constraint.GetConstraintType()) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
102 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
103 case ConstraintType_Equal: |
3084 | 104 compatibility.LookupIdentifier(matches, level, constraint.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
105 IdentifierConstraintType_Equal, constraint.GetSingleValue()); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
106 break; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
107 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
108 case ConstraintType_SmallerOrEqual: |
3084 | 109 compatibility.LookupIdentifier(matches, level, constraint.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
110 IdentifierConstraintType_SmallerOrEqual, constraint.GetSingleValue()); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
111 break; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
112 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
113 case ConstraintType_GreaterOrEqual: |
3084 | 114 compatibility.LookupIdentifier(matches, level, constraint.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
115 IdentifierConstraintType_GreaterOrEqual, constraint.GetSingleValue()); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
116 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
117 break; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
118 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
119 case ConstraintType_Wildcard: |
3084 | 120 compatibility.LookupIdentifier(matches, level, constraint.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
121 IdentifierConstraintType_Wildcard, constraint.GetSingleValue()); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
122 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
123 break; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
124 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
125 case ConstraintType_List: |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
126 for (size_t i = 0; i < constraint.GetValuesCount(); i++) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
127 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
128 std::list<int64_t> tmp; |
3084 | 129 compatibility.LookupIdentifier(tmp, level, constraint.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
130 IdentifierConstraintType_Wildcard, constraint.GetValue(i)); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
131 matches.splice(matches.end(), tmp); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
132 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
133 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
134 break; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
135 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
136 default: |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
137 throw OrthancException(ErrorCode_InternalError); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
138 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
139 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
140 candidates.Intersect(matches); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
141 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
142 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
143 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
144 static void ApplyIdentifierRange(SetOfResources& candidates, |
3085 | 145 ILookupResources& compatibility, |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
146 const DatabaseConstraint& smaller, |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
147 const DatabaseConstraint& greater, |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
148 ResourceType level) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
149 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
150 assert(smaller.GetConstraintType() == ConstraintType_SmallerOrEqual && |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
151 greater.GetConstraintType() == ConstraintType_GreaterOrEqual && |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
152 smaller.GetTag() == greater.GetTag() && |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
153 ServerToolbox::IsIdentifier(smaller.GetTag(), level)); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
154 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
155 std::list<int64_t> matches; |
3084 | 156 compatibility.LookupIdentifierRange(matches, level, smaller.GetTag(), |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
157 greater.GetSingleValue(), smaller.GetSingleValue()); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
158 candidates.Intersect(matches); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
159 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
160 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
161 |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
162 static void ApplyLevel(SetOfResources& candidates, |
3084 | 163 IDatabaseWrapper& database, |
3085 | 164 ILookupResources& compatibility, |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
165 const std::vector<DatabaseConstraint>& lookup, |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
166 ResourceType level) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
167 { |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
168 typedef std::set<const DatabaseConstraint*> SetOfConstraints; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
169 typedef std::map<DicomTag, SetOfConstraints> Identifiers; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
170 |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
171 // (1) Select which constraints apply to this level, and split |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
172 // them between "identifier tags" constraints and "main DICOM |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
173 // tags" constraints |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
174 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
175 Identifiers identifiers; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
176 SetOfConstraints mainTags; |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
177 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
178 for (size_t i = 0; i < lookup.size(); i++) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
179 { |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
180 if (lookup[i].GetLevel() == level) |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
181 { |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
182 if (lookup[i].IsIdentifier()) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
183 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
184 identifiers[lookup[i].GetTag()].insert(&lookup[i]); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
185 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
186 else |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
187 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
188 mainTags.insert(&lookup[i]); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
189 } |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
190 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
191 } |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
192 |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
193 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
194 // (2) Apply the constraints over the identifiers |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
195 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
196 for (Identifiers::const_iterator it = identifiers.begin(); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
197 it != identifiers.end(); ++it) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
198 { |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
199 // Check whether some range constraint over identifiers is |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
200 // present at this level |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
201 const DatabaseConstraint* smaller = NULL; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
202 const DatabaseConstraint* greater = NULL; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
203 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
204 for (SetOfConstraints::const_iterator it2 = it->second.begin(); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
205 it2 != it->second.end(); ++it2) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
206 { |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
207 assert(*it2 != NULL); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
208 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
209 if ((*it2)->GetConstraintType() == ConstraintType_SmallerOrEqual) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
210 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
211 smaller = *it2; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
212 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
213 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
214 if ((*it2)->GetConstraintType() == ConstraintType_GreaterOrEqual) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
215 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
216 greater = *it2; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
217 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
218 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
219 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
220 if (smaller != NULL && |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
221 greater != NULL) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
222 { |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
223 // There is a range constraint: Apply it, as it is more efficient |
3084 | 224 ApplyIdentifierRange(candidates, compatibility, *smaller, *greater, level); |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
225 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
226 else |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
227 { |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
228 smaller = NULL; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
229 greater = NULL; |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
230 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
231 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
232 for (SetOfConstraints::const_iterator it2 = it->second.begin(); |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
233 it2 != it->second.end(); ++it2) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
234 { |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
235 // Check to avoid applying twice the range constraint |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
236 if (*it2 != smaller && |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
237 *it2 != greater) |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
238 { |
3084 | 239 ApplyIdentifierConstraint(candidates, compatibility, **it2, level); |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
240 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
241 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
242 } |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
243 |
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
244 |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
245 // (3) Apply the constraints over the main DICOM tags (no index |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
246 // here, so this is less efficient than filtering over the |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
247 // identifiers) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
248 if (!mainTags.empty()) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
249 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
250 MainTagsConstraints c; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
251 c.Reserve(mainTags.size()); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
252 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
253 for (SetOfConstraints::const_iterator it = mainTags.begin(); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
254 it != mainTags.end(); ++it) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
255 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
256 assert(*it != NULL); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
257 c.Add(**it); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
258 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
259 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
260 std::list<int64_t> source; |
3084 | 261 candidates.Flatten(compatibility, source); |
3055
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
262 candidates.Clear(); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
263 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
264 std::list<int64_t> filtered; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
265 for (std::list<int64_t>::const_iterator candidate = source.begin(); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
266 candidate != source.end(); ++candidate) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
267 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
268 DicomMap tags; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
269 database.GetMainDicomTags(tags, *candidate); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
270 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
271 bool match = true; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
272 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
273 for (size_t i = 0; i < c.GetSize(); i++) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
274 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
275 if (!c.GetConstraint(i).IsMatch(tags)) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
276 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
277 match = false; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
278 break; |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
279 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
280 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
281 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
282 if (match) |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
283 { |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
284 filtered.push_back(*candidate); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
285 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
286 } |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
287 |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
288 candidates.Intersect(filtered); |
71ac4f28176f
compatibility layer seems to be working
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3054
diff
changeset
|
289 } |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
290 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
291 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
292 |
3084 | 293 static std::string GetOneInstance(IDatabaseWrapper& compatibility, |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
294 int64_t resource, |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
295 ResourceType level) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
296 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
297 for (int i = level; i < ResourceType_Instance; i++) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
298 { |
3084 | 299 assert(compatibility.GetResourceType(resource) == static_cast<ResourceType>(i)); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
300 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
301 std::list<int64_t> children; |
3084 | 302 compatibility.GetChildrenInternalId(children, resource); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
303 |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
304 if (children.empty()) |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
305 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
306 throw OrthancException(ErrorCode_Database); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
307 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
308 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
309 resource = children.front(); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
310 } |
3054
3638de45a08c
backward compatibility with filtering identifiers
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3053
diff
changeset
|
311 |
3084 | 312 return compatibility.GetPublicId(resource); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
313 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
314 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
315 |
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
316 void DatabaseLookup::ApplyLookupResources(std::list<std::string>& resourcesId, |
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
317 std::list<std::string>* instancesId, |
3052
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
318 const std::vector<DatabaseConstraint>& lookup, |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
319 ResourceType queryLevel, |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
320 size_t limit) |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
321 { |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
322 // This is a re-implementation of |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
323 // "../../../Resources/Graveyard/DatabaseOptimizations/LookupResource.cpp" |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
324 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
325 assert(ResourceType_Patient < ResourceType_Study && |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
326 ResourceType_Study < ResourceType_Series && |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
327 ResourceType_Series < ResourceType_Instance); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
328 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
329 ResourceType upperLevel = queryLevel; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
330 ResourceType lowerLevel = queryLevel; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
331 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
332 for (size_t i = 0; i < lookup.size(); i++) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
333 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
334 ResourceType level = lookup[i].GetLevel(); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
335 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
336 if (level < upperLevel) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
337 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
338 upperLevel = level; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
339 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
340 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
341 if (level > lowerLevel) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
342 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
343 lowerLevel = level; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
344 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
345 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
346 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
347 assert(upperLevel <= queryLevel && |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
348 queryLevel <= lowerLevel); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
349 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
350 SetOfResources candidates(database_, upperLevel); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
351 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
352 for (int level = upperLevel; level <= lowerLevel; level++) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
353 { |
3084 | 354 ApplyLevel(candidates, database_, compatibility_, lookup, static_cast<ResourceType>(level)); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
355 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
356 if (level != lowerLevel) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
357 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
358 candidates.GoDown(); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
359 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
360 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
361 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
362 std::list<int64_t> resources; |
3084 | 363 candidates.Flatten(compatibility_, resources); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
364 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
365 // Climb up, up to queryLevel |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
366 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
367 for (int level = lowerLevel; level > queryLevel; level--) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
368 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
369 std::list<int64_t> parents; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
370 for (std::list<int64_t>::const_iterator |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
371 it = resources.begin(); it != resources.end(); ++it) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
372 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
373 int64_t parent; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
374 if (database_.LookupParent(parent, *it)) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
375 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
376 parents.push_back(parent); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
377 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
378 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
379 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
380 resources.swap(parents); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
381 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
382 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
383 // Apply the limit, if given |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
384 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
385 if (limit != 0 && |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
386 resources.size() > limit) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
387 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
388 resources.resize(limit); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
389 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
390 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
391 // Get the public ID of all the selected resources |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
392 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
393 size_t pos = 0; |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
394 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
395 for (std::list<int64_t>::const_iterator |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
396 it = resources.begin(); it != resources.end(); ++it, pos++) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
397 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
398 assert(database_.GetResourceType(*it) == queryLevel); |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
399 |
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
400 const std::string resource = database_.GetPublicId(*it); |
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
401 resourcesId.push_back(resource); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
402 |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
403 if (instancesId != NULL) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
404 { |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
405 if (queryLevel == ResourceType_Instance) |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
406 { |
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
407 // The resource is itself the instance |
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
408 instancesId->push_back(resource); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
409 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
410 else |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
411 { |
3075
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
412 // Collect one child instance for each of the selected resources |
ead8576a02ef
IDatabaseWrapper::ApplyLookupResources now returns lists
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3062
diff
changeset
|
413 instancesId->push_back(GetOneInstance(database_, *it, queryLevel)); |
3053
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
414 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
415 } |
3f986ce336c8
working on Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3052
diff
changeset
|
416 } |
3052
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
417 } |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
418 } |
c7db469bbe8e
new class: Compatibility::DatabaseLookup
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
419 } |