annotate OrthancServer/ResourceFinder.cpp @ 1355:28563d910039

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 13 May 2015 13:16:49 +0200
parents 3dd494f201a1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2015 Sebastien Jodogne, Medical Physics
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 *
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 * This program is free software: you can redistribute it and/or
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 * modify it under the terms of the GNU General Public License as
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * published by the Free Software Foundation, either version 3 of the
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * License, or (at your option) any later version.
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 *
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * In addition, as a special exception, the copyright holders of this
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 * program give permission to link the code of its release with the
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * that use the same license as the "OpenSSL" library), and distribute
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * the linked executables. You must obey the GNU General Public License
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * in all respects for all of the code used other than "OpenSSL". If you
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 * modify file(s) with this exception, you may extend this exception to
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * your version of the file(s), but you are not obligated to do so. If
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * you do not wish to do so, delete this exception statement from your
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 * version. If you delete this exception statement from all source files
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21 * in the program, then also delete it here.
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22 *
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 * This program is distributed in the hope that it will be useful, but
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24 * WITHOUT ANY WARRANTY; without even the implied warranty of
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 * General Public License for more details.
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 *
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
28 * You should have received a copy of the GNU General Public License
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 **/
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
32
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
33 #include "PrecompiledHeadersServer.h"
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
34 #include "ResourceFinder.h"
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
35
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36 #include "FromDcmtkBridge.h"
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 #include <glog/logging.h>
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 #include <boost/algorithm/string/predicate.hpp>
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 namespace Orthanc
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
42 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
43 static bool Compare(const std::string& a,
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
44 const std::string& b,
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 bool caseSensitive)
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47 if (caseSensitive)
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 return a == b;
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
50 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
51 else
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
52 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
53 return boost::iequals(a, b);
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
54 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
55 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
56
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
57
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
58 class ResourceFinder::CandidateResources
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
59 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
60 private:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
61 typedef std::map<DicomTag, std::string> Query;
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
62
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
63 ServerIndex& index_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
64 ResourceType level_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
65 bool isFilterApplied_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
66 std::set<std::string> filtered_;
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
67
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
69 static void ListToSet(std::set<std::string>& target,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
70 const std::list<std::string>& source)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
71 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
72 for (std::list<std::string>::const_iterator
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
73 it = source.begin(); it != source.end(); ++it)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
74 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
75 target.insert(*it);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
77 }
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
80 void RestrictIdentifier(const DicomTag& tag,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
81 const std::string& value)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
82 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
83 assert((level_ == ResourceType_Patient && tag == DICOM_TAG_PATIENT_ID) ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
84 (level_ == ResourceType_Study && tag == DICOM_TAG_STUDY_INSTANCE_UID) ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
85 (level_ == ResourceType_Study && tag == DICOM_TAG_ACCESSION_NUMBER) ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
86 (level_ == ResourceType_Series && tag == DICOM_TAG_SERIES_INSTANCE_UID) ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
87 (level_ == ResourceType_Instance && tag == DICOM_TAG_SOP_INSTANCE_UID));
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
88
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
89 LOG(INFO) << "Lookup for identifier tag "
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
90 << FromDcmtkBridge::GetName(tag) << " (value: " << value << ")";
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
91
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
92 std::list<std::string> resources;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
93 index_.LookupIdentifier(resources, tag, value, level_);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
94
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
95 if (isFilterApplied_)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
96 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
97 std::set<std::string> s;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
98 ListToSet(s, resources);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
99
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
100 std::set<std::string> tmp = filtered_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
101 filtered_.clear();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
102
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
103 for (std::set<std::string>::const_iterator
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
104 it = tmp.begin(); it != tmp.end(); ++it)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
105 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
106 if (s.find(*it) != s.end())
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
107 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
108 filtered_.insert(*it);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
109 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
110 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
111 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
112 else
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
113 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
114 assert(filtered_.empty());
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
115 isFilterApplied_ = true;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
116 ListToSet(filtered_, resources);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
117 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
118 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
119
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
120
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
121 void RestrictIdentifier(Query& query,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
122 const DicomTag& tag)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
123 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
124 Query::iterator it = query.find(tag);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
125 if (it != query.end())
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
126 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
127 RestrictIdentifier(it->first, it->second);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
128 query.erase(it);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
129 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
130 }
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
131
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
132
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
133 public:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
134 CandidateResources(ServerIndex& index) :
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
135 index_(index),
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
136 level_(ResourceType_Patient),
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
137 isFilterApplied_(false)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
138 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
139 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
140
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
141 ResourceType GetLevel() const
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
142 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
143 return level_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
144 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
145
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
146 void GoDown()
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
147 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
148 assert(level_ != ResourceType_Instance);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
149
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
150 if (isFilterApplied_)
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
151 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
152 std::set<std::string> tmp = filtered_;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
153
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
154 filtered_.clear();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
155
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
156 for (std::set<std::string>::const_iterator
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
157 it = tmp.begin(); it != tmp.end(); ++it)
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
158 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
159 std::list<std::string> children;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
160 index_.GetChildren(children, *it);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
161 ListToSet(filtered_, children);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
162 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
163 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
164
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
165 switch (level_)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
166 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
167 case ResourceType_Patient:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
168 level_ = ResourceType_Study;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
169 break;
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
170
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
171 case ResourceType_Study:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
172 level_ = ResourceType_Series;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
173 break;
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
174
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
175 case ResourceType_Series:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
176 level_ = ResourceType_Instance;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
177 break;
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
178
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
179 default:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
180 throw OrthancException(ErrorCode_InternalError);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
181 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
182 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
183
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
184
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
185 void Flatten(std::list<std::string>& resources) const
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
186 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
187 resources.clear();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
188
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
189 if (isFilterApplied_)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
190 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
191 for (std::set<std::string>::const_iterator
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
192 it = filtered_.begin(); it != filtered_.end(); ++it)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
193 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
194 resources.push_back(*it);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
195 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
196 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
197 else
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
198 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
199 index_.GetAllUuids(resources, level_);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
200 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
201 }
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
202
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
203
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
204 void RestrictIdentifier(Query& query)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
205 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
206 switch (level_)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
207 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
208 case ResourceType_Patient:
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
209 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
210 RestrictIdentifier(query, DICOM_TAG_PATIENT_ID);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
211 break;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
212 }
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
213
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
214 case ResourceType_Study:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
215 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
216 RestrictIdentifier(query, DICOM_TAG_STUDY_INSTANCE_UID);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
217 RestrictIdentifier(query, DICOM_TAG_ACCESSION_NUMBER);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
218 break;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
219 }
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
220
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
221 case ResourceType_Series:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
222 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
223 RestrictIdentifier(query, DICOM_TAG_SERIES_INSTANCE_UID);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
224 break;
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
225 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
226
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
227 case ResourceType_Instance:
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
228 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
229 RestrictIdentifier(query, DICOM_TAG_SOP_INSTANCE_UID);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
230 break;
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
231 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
232
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
233 default:
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
234 throw OrthancException(ErrorCode_InternalError);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
235 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
236 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
237
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
238
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
239 void RestrictMainDicomTags(const Query& query,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
240 bool caseSensitive)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
241 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
242 if (query.size() == 0)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
243 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
244 return;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
245 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
246
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
247 std::list<std::string> resources;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
248 Flatten(resources);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
249
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
250 isFilterApplied_ = true;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
251 filtered_.clear();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
252
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
253 for (std::list<std::string>::const_iterator
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
254 it = resources.begin(); it != resources.end(); it++)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
255 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
256 DicomMap mainTags;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
257 if (index_.GetMainDicomTags(mainTags, *it, level_))
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
258 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
259 for (Query::const_iterator tag = query.begin();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
260 tag != query.end(); ++tag)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
261 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
262 assert(DicomMap::IsMainDicomTag(tag->first, level_));
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
263 if (tag->first != DICOM_TAG_PATIENT_ID &&
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
264 tag->first != DICOM_TAG_STUDY_INSTANCE_UID &&
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
265 tag->first != DICOM_TAG_ACCESSION_NUMBER &&
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
266 tag->first != DICOM_TAG_SERIES_INSTANCE_UID &&
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
267 tag->first != DICOM_TAG_SOP_INSTANCE_UID)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
268 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
269 LOG(INFO) << "Lookup for main DICOM tag "
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
270 << FromDcmtkBridge::GetName(tag->first) << " (value: " << tag->second << ")";
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
271
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
272 const DicomValue* value = mainTags.TestAndGetValue(tag->first);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
273 if (value != NULL &&
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
274 Compare(value->AsString(), tag->second, caseSensitive))
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
275 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
276 filtered_.insert(*it);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
277 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
278 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
279 }
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
280 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
281 }
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
282 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
283 };
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
284
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
285
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
286 ResourceFinder::ResourceFinder(ServerIndex& index) :
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
287 index_(index),
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
288 level_(ResourceType_Patient),
1355
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1354
diff changeset
289 caseSensitive_(true),
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1354
diff changeset
290 nonMainTagsIgnored_(false)
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
291 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
292 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
293
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
294
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
295 void ResourceFinder::AddTag(const std::string& tag,
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
296 const std::string& value)
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
297 {
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
298 AddTag(FromDcmtkBridge::ParseTag(tag.c_str()), value);
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
299 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
300
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
301
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
302 void ResourceFinder::ExtractTagsForLevel(Query& target,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
303 Query& source,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
304 ResourceType level)
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
305 {
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
306 typedef std::set<DicomTag> Tags;
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
307
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
308 Tags tags;
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
309 DicomMap::GetMainDicomTags(tags, level);
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
310
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
311 target.clear();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
312
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
313 for (Tags::const_iterator tag = tags.begin(); tag != tags.end(); tag++)
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
314 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
315 Query::iterator value = source.find(*tag);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
316 if (value != source.end())
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
317 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
318 target.insert(*value);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
319 source.erase(value);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
320 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
321 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
322 }
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
323
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
324
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
325 void ResourceFinder::ApplyAtLevel(CandidateResources& candidates,
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
326 ResourceType level)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
327 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
328 if (level != ResourceType_Patient)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
329 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
330 candidates.GoDown();
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
331 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
332
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
333 candidates.RestrictIdentifier(query_);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
334
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
335 Query tmp;
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
336 ExtractTagsForLevel(tmp, query_, level);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
337 candidates.RestrictMainDicomTags(tmp, caseSensitive_);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
338 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
339
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
340
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
341 void ResourceFinder::Apply(std::list<std::string>& result)
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
342 {
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
343 CandidateResources candidates(index_);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
344
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
345 ApplyAtLevel(candidates, ResourceType_Patient);
1353
d7da97e21161 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1352
diff changeset
346
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
347 if (level_ == ResourceType_Study ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
348 level_ == ResourceType_Series ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
349 level_ == ResourceType_Instance)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
350 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
351 ApplyAtLevel(candidates, ResourceType_Study);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
352 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
353
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
354 if (level_ == ResourceType_Series ||
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
355 level_ == ResourceType_Instance)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
356 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
357 ApplyAtLevel(candidates, ResourceType_Series);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
358 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
359
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
360 if (level_ == ResourceType_Instance)
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
361 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
362 ApplyAtLevel(candidates, ResourceType_Instance);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
363 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
364
1355
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1354
diff changeset
365 if (!nonMainTagsIgnored_ &&
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1354
diff changeset
366 !query_.empty())
1354
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
367 {
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
368 LOG(ERROR) << "Invalid query: Searching against a tag that is not valid for the requested level";
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
369 throw OrthancException(ErrorCode_BadRequest);
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
370 }
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
371
3dd494f201a1 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 1353
diff changeset
372 candidates.Flatten(result);
1352
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 }
382439943749 ResourceFinder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 }