Mercurial > hg > orthanc
annotate OrthancServer/OrthancFindRequestHandler.cpp @ 681:3bdb5db8e839 query-retrieve
generalization of query/retrieve
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Fri, 24 Jan 2014 17:40:45 +0100 |
| parents | 41b3e5ccb291 |
| children | 67e6400fca03 |
| rev | line source |
|---|---|
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2013 Medical Physics Department, CHU of Liege, |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Belgium |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 * |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * This program is free software: you can redistribute it and/or |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * modify it under the terms of the GNU General Public License as |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
8 * published by the Free Software Foundation, either version 3 of the |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
9 * License, or (at your option) any later version. |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
10 * |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * In addition, as a special exception, the copyright holders of this |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * program give permission to link the code of its release with the |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * OpenSSL project's "OpenSSL" library (or with modified versions of it |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * that use the same license as the "OpenSSL" library), and distribute |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 * the linked executables. You must obey the GNU General Public License |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * in all respects for all of the code used other than "OpenSSL". If you |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 * modify file(s) with this exception, you may extend this exception to |
|
c931ac02db82
refactoring of find class
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 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 * you do not wish to do so, delete this exception statement from your |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 * version. If you delete this exception statement from all source files |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 * in the program, then also delete it here. |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 * |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 * This program is distributed in the hope that it will be useful, but |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 * General Public License for more details. |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 * |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 * You should have received a copy of the GNU General Public License |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 **/ |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 #include "OrthancFindRequestHandler.h" |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 #include <glog/logging.h> |
| 608 | 35 #include <boost/regex.hpp> |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 #include "../Core/DicomFormat/DicomArray.h" |
| 608 | 38 #include "ServerToolbox.h" |
| 618 | 39 #include "OrthancInitialization.h" |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 namespace Orthanc |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 { |
| 615 | 43 static bool IsWildcard(const std::string& constraint) |
| 44 { | |
| 45 return (constraint.find('-') != std::string::npos || | |
| 46 constraint.find('*') != std::string::npos || | |
| 47 constraint.find('\\') != std::string::npos || | |
| 48 constraint.find('?') != std::string::npos); | |
| 49 } | |
| 50 | |
| 610 | 51 static std::string ToLowerCase(const std::string& s) |
| 52 { | |
| 53 std::string result = s; | |
| 54 Toolbox::ToLowerCase(result); | |
| 55 return result; | |
| 56 } | |
| 57 | |
| 608 | 58 static bool ApplyRangeConstraint(const std::string& value, |
| 59 const std::string& constraint) | |
| 60 { | |
| 610 | 61 size_t separator = constraint.find('-'); |
| 62 std::string lower = ToLowerCase(constraint.substr(0, separator)); | |
| 63 std::string upper = ToLowerCase(constraint.substr(separator + 1)); | |
| 64 std::string v = ToLowerCase(value); | |
| 65 | |
| 66 if (lower.size() == 0 && upper.size() == 0) | |
| 67 { | |
| 68 return false; | |
| 69 } | |
| 70 | |
| 71 if (lower.size() == 0) | |
| 72 { | |
| 73 return v <= upper; | |
| 74 } | |
| 75 | |
| 76 if (upper.size() == 0) | |
| 77 { | |
| 78 return v >= lower; | |
| 79 } | |
| 80 | |
| 81 return (v >= lower && v <= upper); | |
| 608 | 82 } |
| 83 | |
| 84 | |
| 85 static bool ApplyListConstraint(const std::string& value, | |
| 86 const std::string& constraint) | |
| 87 { | |
| 610 | 88 std::string v1 = ToLowerCase(value); |
| 608 | 89 |
| 90 std::vector<std::string> items; | |
| 91 Toolbox::TokenizeString(items, constraint, '\\'); | |
| 92 | |
| 93 for (size_t i = 0; i < items.size(); i++) | |
| 94 { | |
| 95 Toolbox::ToLowerCase(items[i]); | |
| 96 if (items[i] == v1) | |
| 97 { | |
| 98 return true; | |
| 99 } | |
| 100 } | |
| 101 | |
| 102 return false; | |
| 103 } | |
| 104 | |
| 105 | |
| 106 static bool Matches(const std::string& value, | |
| 107 const std::string& constraint) | |
| 108 { | |
| 109 // http://www.itk.org/Wiki/DICOM_QueryRetrieve_Explained | |
| 110 // http://dicomiseasy.blogspot.be/2012/01/dicom-queryretrieve-part-i.html | |
| 111 | |
| 112 if (constraint.find('-') != std::string::npos) | |
| 113 { | |
| 114 return ApplyRangeConstraint(value, constraint); | |
| 115 } | |
| 116 | |
| 117 if (constraint.find('\\') != std::string::npos) | |
| 118 { | |
| 119 return ApplyListConstraint(value, constraint); | |
| 120 } | |
| 121 | |
| 122 if (constraint.find('*') != std::string::npos || | |
| 123 constraint.find('?') != std::string::npos) | |
| 124 { | |
| 125 // TODO - Cache the constructed regular expression | |
| 126 boost::regex pattern(Toolbox::WildcardToRegularExpression(constraint), | |
| 127 boost::regex::icase /* case insensitive search */); | |
| 128 return boost::regex_match(value, pattern); | |
| 129 } | |
| 130 else | |
| 131 { | |
| 610 | 132 return ToLowerCase(value) == ToLowerCase(constraint); |
| 608 | 133 } |
| 134 } | |
| 135 | |
| 136 | |
| 137 static bool LookupOneInstance(std::string& result, | |
| 138 ServerIndex& index, | |
| 139 const std::string& id, | |
| 140 ResourceType type) | |
| 141 { | |
| 142 if (type == ResourceType_Instance) | |
| 143 { | |
| 144 result = id; | |
| 145 return true; | |
| 146 } | |
| 147 | |
| 148 std::string childId; | |
| 149 | |
| 150 { | |
| 151 std::list<std::string> children; | |
| 152 index.GetChildInstances(children, id); | |
| 153 | |
| 656 | 154 if (children.empty()) |
| 608 | 155 { |
| 156 return false; | |
| 157 } | |
| 158 | |
| 159 childId = children.front(); | |
| 160 } | |
| 161 | |
| 162 return LookupOneInstance(result, index, childId, GetChildResourceType(type)); | |
| 163 } | |
| 164 | |
| 165 | |
| 166 static bool Matches(const Json::Value& resource, | |
| 167 const DicomArray& query) | |
| 168 { | |
| 169 for (size_t i = 0; i < query.GetSize(); i++) | |
| 170 { | |
| 171 if (query.GetElement(i).GetValue().IsNull() || | |
| 172 query.GetElement(i).GetTag() == DICOM_TAG_QUERY_RETRIEVE_LEVEL || | |
|
611
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
173 query.GetElement(i).GetTag() == DICOM_TAG_SPECIFIC_CHARACTER_SET || |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
174 query.GetElement(i).GetTag() == DICOM_TAG_MODALITIES_IN_STUDY) |
| 608 | 175 { |
| 176 continue; | |
| 177 } | |
| 178 | |
| 179 std::string tag = query.GetElement(i).GetTag().Format(); | |
| 180 std::string value; | |
| 181 if (resource.isMember(tag)) | |
| 182 { | |
| 183 value = resource.get(tag, Json::arrayValue).get("Value", "").asString(); | |
| 184 } | |
| 185 | |
| 186 if (!Matches(value, query.GetElement(i).GetValue().AsString())) | |
| 187 { | |
| 188 return false; | |
| 189 } | |
| 190 } | |
| 191 | |
| 192 return true; | |
| 193 } | |
| 194 | |
| 195 | |
| 196 static void AddAnswer(DicomFindAnswers& answers, | |
| 197 const Json::Value& resource, | |
| 198 const DicomArray& query) | |
| 199 { | |
| 200 DicomMap result; | |
| 201 | |
| 202 for (size_t i = 0; i < query.GetSize(); i++) | |
| 203 { | |
| 204 if (query.GetElement(i).GetTag() != DICOM_TAG_QUERY_RETRIEVE_LEVEL && | |
| 205 query.GetElement(i).GetTag() != DICOM_TAG_SPECIFIC_CHARACTER_SET) | |
| 206 { | |
| 207 std::string tag = query.GetElement(i).GetTag().Format(); | |
| 208 std::string value; | |
| 209 if (resource.isMember(tag)) | |
| 210 { | |
| 211 value = resource.get(tag, Json::arrayValue).get("Value", "").asString(); | |
| 212 result.SetValue(query.GetElement(i).GetTag(), value); | |
| 213 } | |
| 214 } | |
| 215 } | |
| 216 | |
| 217 answers.Add(result); | |
| 218 } | |
| 219 | |
| 220 | |
| 615 | 221 static bool ApplyModalitiesInStudyFilter(std::list<std::string>& filteredStudies, |
| 222 const std::list<std::string>& studies, | |
| 612 | 223 const DicomMap& input, |
| 224 ServerIndex& index) | |
| 225 { | |
| 615 | 226 filteredStudies.clear(); |
| 612 | 227 |
| 228 const DicomValue& v = input.GetValue(DICOM_TAG_MODALITIES_IN_STUDY); | |
| 229 if (v.IsNull()) | |
| 230 { | |
| 231 return false; | |
| 232 } | |
| 233 | |
| 234 // Move the allowed modalities into a "std::set" | |
| 235 std::vector<std::string> tmp; | |
| 236 Toolbox::TokenizeString(tmp, v.AsString(), '\\'); | |
| 237 | |
| 238 std::set<std::string> modalities; | |
| 239 for (size_t i = 0; i < tmp.size(); i++) | |
| 240 { | |
| 241 modalities.insert(tmp[i]); | |
| 242 } | |
| 243 | |
| 244 // Loop over the studies | |
| 615 | 245 for (std::list<std::string>::const_iterator |
| 656 | 246 it = studies.begin(); it != studies.end(); ++it) |
| 612 | 247 { |
| 248 try | |
| 249 { | |
| 250 // We are considering a single study. Check whether one of | |
| 251 // its child series matches one of the modalities. | |
| 252 Json::Value study; | |
| 615 | 253 if (index.LookupResource(study, *it, ResourceType_Study)) |
| 612 | 254 { |
| 255 // Loop over the series of the considered study. | |
| 256 for (Json::Value::ArrayIndex j = 0; j < study["Series"].size(); j++) // (*) | |
| 257 { | |
| 258 Json::Value series; | |
| 259 if (index.LookupResource(series, study["Series"][j].asString(), ResourceType_Series)) | |
| 260 { | |
| 261 // Get the modality of this series | |
| 262 if (series["MainDicomTags"].isMember("Modality")) | |
| 263 { | |
| 264 std::string modality = series["MainDicomTags"]["Modality"].asString(); | |
| 265 if (modalities.find(modality) != modalities.end()) | |
| 266 { | |
| 267 // This series of the considered study matches one | |
| 268 // of the required modalities. Take the study into | |
| 269 // consideration for future filtering. | |
| 615 | 270 filteredStudies.push_back(*it); |
| 612 | 271 |
| 272 // We have finished considering this study. Break the study loop at (*). | |
| 273 break; | |
| 274 } | |
| 275 } | |
| 276 } | |
| 277 } | |
| 278 } | |
| 279 } | |
| 280 catch (OrthancException&) | |
| 281 { | |
| 282 // This resource has probably been deleted during the find request | |
| 283 } | |
| 284 } | |
| 285 | |
| 286 return true; | |
| 287 } | |
| 288 | |
| 289 | |
| 615 | 290 static bool LookupCandidateResourcesInternal(/* out */ std::list<std::string>& resources, |
| 291 /* in */ ServerIndex& index, | |
| 292 /* in */ ResourceType level, | |
| 293 /* in */ const DicomMap& query, | |
| 294 /* in */ DicomTag tag) | |
| 295 { | |
| 296 if (query.HasTag(tag)) | |
| 297 { | |
| 298 const DicomValue& value = query.GetValue(tag); | |
| 299 if (!value.IsNull()) | |
| 300 { | |
| 301 std::string str = query.GetValue(tag).AsString(); | |
| 302 if (!IsWildcard(str)) | |
| 303 { | |
| 304 index.LookupTagValue(resources, tag, str/*, level*/); | |
| 305 return true; | |
| 306 } | |
| 307 } | |
| 308 } | |
| 309 | |
| 310 return false; | |
| 311 } | |
| 312 | |
| 313 | |
|
681
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
314 static bool LookupCandidateResourcesInternal(/* inout */ std::set<std::string>& resources, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
315 /* in */ bool alreadyFiltered, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
316 /* in */ ServerIndex& index, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
317 /* in */ ResourceType level, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
318 /* in */ const DicomMap& query, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
319 /* in */ DicomTag tag) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
320 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
321 assert(alreadyFiltered || resources.size() == 0); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
322 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
323 if (!query.HasTag(tag)) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
324 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
325 return alreadyFiltered; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
326 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
327 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
328 const DicomValue& value = query.GetValue(tag); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
329 if (value.IsNull()) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
330 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
331 return alreadyFiltered; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
332 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
333 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
334 std::string str = query.GetValue(tag).AsString(); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
335 if (IsWildcard(str)) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
336 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
337 return alreadyFiltered; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
338 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
339 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
340 std::list<std::string> matches; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
341 index.LookupTagValue(matches, tag, str/*, level*/); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
342 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
343 if (alreadyFiltered) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
344 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
345 std::set<std::string> previous = resources; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
346 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
347 for (std::list<std::string>::const_iterator |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
348 it = matches.begin(); it != matches.end(); it++) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
349 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
350 if (previous.find(*it) != previous.end()) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
351 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
352 resources.insert(*it); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
353 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
354 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
355 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
356 else |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
357 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
358 for (std::list<std::string>::const_iterator |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
359 it = matches.begin(); it != matches.end(); it++) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
360 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
361 resources.insert(*it); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
362 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
363 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
364 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
365 return true; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
366 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
367 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
368 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
369 static bool LookupCandidateResourcesAtOneLevel(/* out */ std::set<std::string>& resources, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
370 /* in */ ServerIndex& index, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
371 /* in */ ResourceType level, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
372 /* in */ const DicomMap& fullQuery, |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
373 /* in */ ModalityManufacturer manufacturer) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
374 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
375 DicomMap tmp; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
376 fullQuery.ExtractMainDicomTagsForLevel(tmp, level); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
377 DicomArray query(tmp); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
378 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
379 if (query.GetSize() == 0) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
380 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
381 return false; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
382 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
383 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
384 for (size_t i = 0; i < query.GetSize(); i++) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
385 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
386 const DicomTag tag = query.GetElement(i).GetTag(); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
387 const DicomValue& value = query.GetElement(i).GetValue(); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
388 if (!value.IsNull()) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
389 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
390 // TODO TODO TODO |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
391 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
392 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
393 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
394 printf(">>>>>>>>>>\n"); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
395 query.Print(stdout); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
396 printf("<<<<<<<<<<\n\n"); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
397 return true; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
398 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
399 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
400 |
| 615 | 401 static void LookupCandidateResources(/* out */ std::list<std::string>& resources, |
| 402 /* in */ ServerIndex& index, | |
| 403 /* in */ ResourceType level, | |
| 665 | 404 /* in */ const DicomMap& query, |
| 405 /* in */ ModalityManufacturer manufacturer) | |
| 615 | 406 { |
|
681
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
407 #if 1 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
408 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
409 std::set<std::string> s; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
410 LookupCandidateResourcesAtOneLevel(s, index, ResourceType_Patient, query, manufacturer); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
411 LookupCandidateResourcesAtOneLevel(s, index, ResourceType_Study, query, manufacturer); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
412 LookupCandidateResourcesAtOneLevel(s, index, ResourceType_Series, query, manufacturer); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
413 LookupCandidateResourcesAtOneLevel(s, index, ResourceType_Instance, query, manufacturer); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
414 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
415 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
416 std::set<std::string> filtered; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
417 bool isFiltered = false; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
418 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
419 // Filter by indexed tags, from most specific to least specific |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
420 //isFiltered = LookupCandidateResourcesInternal(filtered, isFiltered, index, level, query, DICOM_TAG_SOP_INSTANCE_UID); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
421 isFiltered = LookupCandidateResourcesInternal(filtered, isFiltered, index, level, query, DICOM_TAG_SERIES_INSTANCE_UID); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
422 //isFiltered = LookupCandidateResourcesInternal(filtered, isFiltered, index, level, query, DICOM_TAG_STUDY_INSTANCE_UID); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
423 //isFiltered = LookupCandidateResourcesInternal(filtered, isFiltered, index, level, query, DICOM_TAG_PATIENT_ID); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
424 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
425 resources.clear(); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
426 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
427 if (isFiltered) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
428 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
429 for (std::set<std::string>::const_iterator |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
430 it = filtered.begin(); it != filtered.end(); it++) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
431 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
432 resources.push_back(*it); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
433 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
434 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
435 else |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
436 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
437 // No indexed tag matches the query. Return all the resources at this query level. |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
438 Json::Value allResources; |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
439 index.GetAllUuids(allResources, level); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
440 assert(allResources.type() == Json::arrayValue); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
441 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
442 for (Json::Value::ArrayIndex i = 0; i < allResources.size(); i++) |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
443 { |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
444 resources.push_back(allResources[i].asString()); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
445 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
446 } |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
447 |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
448 #else |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
449 |
| 615 | 450 // TODO : Speed up using full querying against the MainDicomTags. |
| 451 | |
| 452 resources.clear(); | |
| 453 | |
| 454 bool done = false; | |
| 455 | |
| 456 switch (level) | |
| 457 { | |
| 458 case ResourceType_Patient: | |
| 459 done = LookupCandidateResourcesInternal(resources, index, level, query, DICOM_TAG_PATIENT_ID); | |
| 460 break; | |
| 461 | |
| 462 case ResourceType_Study: | |
| 463 done = LookupCandidateResourcesInternal(resources, index, level, query, DICOM_TAG_STUDY_INSTANCE_UID); | |
| 464 break; | |
| 465 | |
| 466 case ResourceType_Series: | |
| 467 done = LookupCandidateResourcesInternal(resources, index, level, query, DICOM_TAG_SERIES_INSTANCE_UID); | |
| 468 break; | |
| 469 | |
| 470 case ResourceType_Instance: | |
| 665 | 471 if (manufacturer == ModalityManufacturer_MedInria) |
| 472 { | |
| 473 std::list<std::string> series; | |
| 474 | |
| 475 if (LookupCandidateResourcesInternal(series, index, ResourceType_Series, query, DICOM_TAG_SERIES_INSTANCE_UID) && | |
| 476 series.size() == 1) | |
| 477 { | |
| 478 index.GetChildInstances(resources, series.front()); | |
| 479 done = true; | |
| 480 } | |
| 481 } | |
| 482 else | |
| 483 { | |
| 484 done = LookupCandidateResourcesInternal(resources, index, level, query, DICOM_TAG_SOP_INSTANCE_UID); | |
| 485 } | |
| 486 | |
| 615 | 487 break; |
| 488 | |
| 489 default: | |
| 490 break; | |
| 491 } | |
| 492 | |
| 493 if (!done) | |
| 494 { | |
| 495 Json::Value allResources; | |
| 496 index.GetAllUuids(allResources, level); | |
| 497 assert(allResources.type() == Json::arrayValue); | |
| 498 | |
| 499 for (Json::Value::ArrayIndex i = 0; i < allResources.size(); i++) | |
| 500 { | |
| 501 resources.push_back(allResources[i].asString()); | |
| 502 } | |
| 503 } | |
|
681
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
504 #endif |
| 615 | 505 } |
| 506 | |
| 507 | |
| 618 | 508 void OrthancFindRequestHandler::Handle(DicomFindAnswers& answers, |
| 665 | 509 const DicomMap& input, |
| 510 const std::string& callingAETitle) | |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
511 { |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
512 /** |
| 665 | 513 * Retrieve the manufacturer of this modality. |
| 514 **/ | |
| 515 | |
| 516 ModalityManufacturer manufacturer; | |
| 517 | |
| 518 { | |
| 519 std::string symbolicName, address; | |
| 520 int port; | |
| 521 | |
| 522 if (!LookupDicomModalityUsingAETitle(callingAETitle, symbolicName, address, port, manufacturer)) | |
| 523 { | |
| 524 throw OrthancException("Unknown modality"); | |
| 525 } | |
| 526 } | |
| 527 | |
| 528 | |
| 529 /** | |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
530 * Retrieve the query level. |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
531 **/ |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
532 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
533 const DicomValue* levelTmp = input.TestAndGetValue(DICOM_TAG_QUERY_RETRIEVE_LEVEL); |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
534 if (levelTmp == NULL) |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
535 { |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
536 throw OrthancException(ErrorCode_BadRequest); |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
537 } |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
538 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
539 ResourceType level = StringToResourceType(levelTmp->AsString().c_str()); |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
540 |
| 665 | 541 switch (manufacturer) |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
542 { |
| 665 | 543 case ModalityManufacturer_MedInria: |
| 544 // MedInria makes FIND requests at the instance level before starting MOVE | |
| 545 break; | |
| 546 | |
| 547 default: | |
| 548 if (level != ResourceType_Patient && | |
| 549 level != ResourceType_Study && | |
|
681
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
550 level != ResourceType_Series && |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
551 level != ResourceType_Instance) |
| 665 | 552 { |
| 553 throw OrthancException(ErrorCode_NotImplemented); | |
| 554 } | |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
555 } |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
556 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
557 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
558 /** |
| 615 | 559 * Retrieve the candidate resources for this query level. Whenever |
| 560 * possible, we avoid returning ALL the resources for this query | |
| 561 * level, as it would imply reading the JSON file on the harddisk | |
| 562 * for each of them. | |
| 608 | 563 **/ |
| 564 | |
| 615 | 565 std::list<std::string> resources; |
| 665 | 566 LookupCandidateResources(resources, context_.GetIndex(), level, input, manufacturer); |
| 608 | 567 |
|
611
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
568 |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
569 /** |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
570 * Apply filtering on modalities for studies, if asked (this is an |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
571 * extension to standard DICOM) |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
572 * http://www.medicalconnections.co.uk/kb/Filtering_on_and_Retrieving_the_Modality_in_a_C_FIND |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
573 **/ |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
574 |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
575 if (level == ResourceType_Study && |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
576 input.HasTag(DICOM_TAG_MODALITIES_IN_STUDY)) |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
577 { |
| 615 | 578 std::list<std::string> filtered; |
| 612 | 579 if (ApplyModalitiesInStudyFilter(filtered, resources, input, context_.GetIndex())) |
|
611
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
580 { |
| 612 | 581 resources = filtered; |
|
611
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
582 } |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
583 } |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
584 |
|
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
585 |
| 608 | 586 /** |
| 587 * Loop over all the resources for this query level. | |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
588 **/ |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
589 |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
590 DicomArray query(input); |
|
681
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
591 query.Print(stdout); |
|
3bdb5db8e839
generalization of query/retrieve
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
665
diff
changeset
|
592 |
| 615 | 593 for (std::list<std::string>::const_iterator |
| 656 | 594 resource = resources.begin(); resource != resources.end(); ++resource) |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
595 { |
| 608 | 596 try |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
597 { |
| 608 | 598 std::string instance; |
| 615 | 599 if (LookupOneInstance(instance, context_.GetIndex(), *resource, level)) |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
600 { |
| 615 | 601 Json::Value info; |
| 602 context_.ReadJson(info, instance); | |
| 608 | 603 |
| 615 | 604 if (Matches(info, query)) |
| 608 | 605 { |
| 615 | 606 AddAnswer(answers, info, query); |
| 608 | 607 } |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
608 } |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
609 } |
| 608 | 610 catch (OrthancException&) |
| 611 { | |
|
611
9924aec1d694
filtering on modalities
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
610
diff
changeset
|
612 // This resource has probably been deleted during the find request |
| 608 | 613 } |
|
565
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
614 } |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
615 } |
|
c931ac02db82
refactoring of find class
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
616 } |